物料

ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java

@@ -100,6 +100,8 @@ public class BasCustomer extends BaseEntity
 
     private String updateId;
 
+
+
     @Override
     public String getRemark() {
         return remark;

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java

@@ -16,16 +16,16 @@ public class BasTraycode extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
-    @Excel(name = "${bas.Traycode.id}")
+//    @Excel(name = "${bas.Traycode.id}")
     private Long id;
 
     /** 条码类型id */
-    @Excel(name = "${bas.Traycode.formatId}")
+//    @Excel(name = "${bas.Traycode.formatId}")
     private Long formatId;
     private String formatName;
 
     /** 条码 */
-    @Excel(name = "${bas.Traycode.trayCode}")
+    @Excel(name = "条码")
     private String trayCode;
 
     /** 备用字段1 */
@@ -33,7 +33,7 @@ public class BasTraycode extends BaseEntity
     private String spare1;
 
     /** 备用字段2 */
-//    @Excel(name = "${bas.Traycode.spare2}")
+    @Excel(name = "是否可用",dictType = "sys_yes_no")
     private String spare2;
 
     /** 备用字段3 */

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java

@@ -18,13 +18,15 @@ public class BasWarehouse extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id（主键不允许为空）主键 */
-    @Excel(name = "id")
+    @Excel(name = "仓库ID")
     private String warehouseId;
 
     /** 仓库id（不允许为空） */
+    @Excel(name = "仓库编号")
     private String warehouseNo;
 
     /** 项目编号 */
+//    @Excel(name = "${bas.Warehouse.projectNo}")
     private String projectNo;
 
     /** 仓库名称（不允许为空） */
@@ -36,9 +38,11 @@ public class BasWarehouse extends BaseEntity
     private String address;
 
     /** 仓库描述（允许为空） */
+    @Excel(name = "备注")
     private String cDesc;
 
     /** 仓库级别（允许为空）1、2 */
+//    @Excel(name = "${bas.Warehouse.warehouseKind}")
     private String warehouseKind;
 
     /** 仓库类型 */
@@ -49,9 +53,6 @@ public class BasWarehouse extends BaseEntity
     @Excel(name = "是否可用",dictType = "sys_yes_no")
     private String isCurrent;
 
-    @Excel(name = "备注")
-    private String remark;
-
     /*仓库数据权限*/
     private List<String> dataScope;
     private List<String> typeData;
@@ -73,122 +74,114 @@ public class BasWarehouse extends BaseEntity
         this.cDesc = cDesc;
     }
 
-    @Override
-    public String getRemark() {
-        return remark;
-    }
 
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
 
     public void setWarehouseId(String warehouseId)
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() 
     {
         return warehouseId;
     }
 
-    public void setWarehouseNo(String warehouseNo)
+    public void setWarehouseNo(String warehouseNo) 
     {
         this.warehouseNo = warehouseNo;
     }
 
-    public String getWarehouseNo()
+    public String getWarehouseNo() 
     {
         return warehouseNo;
     }
 
-    public void setProjectNo(String projectNo)
+    public void setProjectNo(String projectNo) 
     {
         this.projectNo = projectNo;
     }
 
-    public String getProjectNo()
+    public String getProjectNo() 
     {
         return projectNo;
     }
 
-    public void setWarehouseName(String warehouseName)
+    public void setWarehouseName(String warehouseName) 
     {
         this.warehouseName = warehouseName;
     }
 
-    public String getWarehouseName()
+    public String getWarehouseName() 
     {
         return warehouseName;
     }
 
-    public void setAddress(String address)
+    public void setAddress(String address) 
     {
         this.address = address;
     }
 
-    public String getAddress()
+    public String getAddress() 
     {
         return address;
     }
 
-    public void setCDesc(String cDesc)
+    public void setCDesc(String cDesc) 
     {
         this.cDesc = cDesc;
     }
 
-    public String getCDesc()
+    public String getCDesc() 
     {
         return cDesc;
     }
 
-    public void setWarehouseKind(String warehouseKind)
+    public void setWarehouseKind(String warehouseKind) 
     {
         this.warehouseKind = warehouseKind;
     }
 
-    public String getWarehouseKind()
+    public String getWarehouseKind() 
     {
         return warehouseKind;
     }
 
-    public void setWarehouseType(String warehouseType)
+    public void setWarehouseType(String warehouseType) 
     {
         this.warehouseType = warehouseType;
     }
 
-    public String getWarehouseType()
+    public String getWarehouseType() 
     {
         return warehouseType;
     }
 
-    public void setIsCurrent(String isCurrent)
+    public void setIsCurrent(String isCurrent) 
     {
         this.isCurrent = isCurrent;
     }
 
-    public String getIsCurrent()
+    public String getIsCurrent() 
     {
         return isCurrent;
     }
 
-    public void setDataScope(List<String> dataScope)
+    public void setDataScope(List<String> dataScope) 
     {
         this.dataScope = dataScope;
     }
 
-    public List<String> getDataScope()
+    public List<String> getDataScope() 
     {
         return dataScope;
     }
 
-    public void setTypeData(List<String> typeData)
+    public void setTypeData(List<String> typeData) 
     {
         this.typeData = typeData;
     }
 
-    public List<String> getTypeData()
+    public List<String> getTypeData() 
     {
         return typeData;
     }

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -198,6 +198,8 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult selectStockinDetail(String stockinDetailId) {
         InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(stockinDetailId);
+        int i = Integer.parseInt(inStockinDetail.getQuantity()) - Integer.parseInt(inStockinDetail.getScanNum());
+        inStockinDetail.setQuantityX(String.valueOf(i));
         return AjaxResult.success(inStockinDetail);
 
     }

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lotNo"    column="lot_no"    />
         <result property="productGuid"    column="product_guid"    />
         <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
+
         <result property="quantity"    column="quantity"    />
         <result property="quantityX"    column="quantity_x"    />
         <result property="quantityJ"    column="quantity_j"    />
@@ -81,6 +81,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="model"    column="model"    />
         <result property="orderId"    column="order_id"    />
         <result property="productName"    column="product_name"    />
+        <result property="productPrice"    column="product_price"    />
+        <result property="productDrawNo"    column="product_draw_no"    />
+        <result property="productUnit"    column="product_unit"    />
+        <result property="productSpec"    column="product_spec"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="createSys"    column="create_sys"    />
+        <result property="isUsed"    column="is_used"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerName"    column="customer_name"    />
     </resultMap>
 
     <sql id="selectOutStockoutDetailFinishVo">