4.0.9

原材料条码、原材料库存、原材料入库记录、成品出库记录、成品库存、原材料出库记录、成品入库记录、原材料退库记录、盘点记录增加单位的显示

hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java

@@ -206,6 +206,8 @@ public class MesBaseBarcodeInfo extends BaseEntity
 
     private String prdBarcodeInfo;
 
+    private String unitName;
+
 
     public String getLocationCode() {
         return locationCode;
@@ -672,6 +674,14 @@ public class MesBaseBarcodeInfo extends BaseEntity
         this.prdBarcodeInfo = prdBarcodeInfo;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java

@@ -151,6 +151,8 @@ public class MesBaseMaterialInfo extends BaseEntity
 
     private BigDecimal stockAmount;//实际总库存
 
+    private String unitName;
+
     public Long getPurchasePriceUnitId() {
         return purchasePriceUnitId;
     }
@@ -467,6 +469,14 @@ public class MesBaseMaterialInfo extends BaseEntity
         this.stockAmount = stockAmount;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml

@@ -51,6 +51,7 @@
         <result property="alwaysFlag" column="always_flag"/>
         <result property="checkStatus" column="checkStatus"/>
         <result property="locationBarcodeId" column="location_barcode_id"/>
+        <result property="unitName" column="unit_name"/>
     </resultMap>
 
     <sql id="selectMesBaseBarcodeInfoVo">
@@ -95,9 +96,11 @@
                bbi.bind_by,
                bbi.bind_time,
                bbi.update_by,
-               bbi.update_time
+               bbi.update_time,
+               mbui.unit_name
         from mes_base_barcode_info bbi
                  left join mes_base_material_info bmi on bmi.material_id = bbi.material_id
+                 left join mes_base_unit_info mbui on bmi.material_unit_id = mbui.erp_id
     </sql>
 
     <select id="selectMesBaseBarcodeInfoList" parameterType="MesBaseBarcodeInfo" resultMap="MesBaseBarcodeInfoResult">

hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml

@@ -45,6 +45,7 @@
         <result property="warehouseId" column="warehouse_id"/>
         <result property="purchasePriceUnitId" column="purchase_price_unit_id"/>
         <result property="stockAmount" column="stock_amount"/>
+        <result property="unitName" column="unit_name"/>
     </resultMap>
 
     <sql id="selectMesBaseMaterialInfoVo">
@@ -86,9 +87,11 @@
                bmi.update_time,
                bmi.approve_date,
                bmi.erp_modify_date,
-               bmi.safe_stock_amount
+               bmi.safe_stock_amount,
+               mbui.unit_name
         from mes_base_material_info bmi
                  left join mes_base_material_type bmt on bmt.matrial_type_id = bmi.material_type_id
+                 left join mes_base_unit_info mbui on bmi.material_unit_id = mbui.erp_id
     </sql>
 
     <select id="selectMesBaseMaterialInfoList" parameterType="MesBaseMaterialInfo"

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsInventoryCheckDetail.java

@@ -97,6 +97,8 @@ public class WmsInventoryCheckDetail extends BaseEntity
     /** 盘点状态(0待盘点,1盘点中,2盘点完成); 多个以,隔开 */
     private String checkStatusStr;
 
+    private String unitName;
+
     public void setInventoryCheckDetailId(Long inventoryCheckDetailId)
     {
         this.inventoryCheckDetailId = inventoryCheckDetailId;
@@ -290,6 +292,14 @@ public class WmsInventoryCheckDetail extends BaseEntity
         this.checkStatusStr = checkStatusStr;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsMoveDetail.java

@@ -99,6 +99,7 @@ public class WmsMoveDetail extends BaseEntity
     /**移库合库记录执行状态，多个值使用*/
     private String moveExecuteStatusStr;
 
+    private String unitName;
 
 
     public void setMoveDetailId(Long moveDetailId)
@@ -287,6 +288,14 @@ public class WmsMoveDetail extends BaseEntity
         this.moveExecuteStatusStr = moveExecuteStatusStr;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java

@@ -192,6 +192,8 @@ public class WmsProductInstock extends BaseEntity {
 
     private String materialSpec;
 
+    private String unitName;
+
     public BigDecimal getOutStockAmount() {
         return outStockAmount;
     }
@@ -486,6 +488,14 @@ public class WmsProductInstock extends BaseEntity {
         this.wmsProductInstockDetailList = wmsProductInstockDetailList;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstock.java

@@ -168,6 +168,8 @@ public class WmsProductOutstock extends BaseEntity {
 
     private String materialClassfication;
 
+    private String unitName;
+
     /**
      * 成品出库记录明细信息
      */
@@ -516,6 +518,14 @@ public class WmsProductOutstock extends BaseEntity {
         this.materialClassfication = materialClassfication;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java

@@ -120,6 +120,8 @@ public class WmsProductStock extends BaseEntity
 
     private String stockTypeStr;
 
+    private String unitName;
+
     public void setProductStockId(Long productStockId)
     {
         this.productStockId = productStockId;
@@ -362,6 +364,14 @@ public class WmsProductStock extends BaseEntity
         this.stockTypeStr = stockTypeStr;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawInstock.java

@@ -138,6 +138,8 @@ public class WmsRawInstock extends BaseEntity
 
     private String srcBillNo;
 
+    private String unitName;
+
     public String getSpecificationParameter() {
         return specificationParameter;
     }
@@ -419,6 +421,14 @@ public class WmsRawInstock extends BaseEntity
         this.srcBillNo = srcBillNo;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstock.java

@@ -236,6 +236,7 @@ public class WmsRawOutstock extends BaseEntity {
 
     private String taskTypeStr;
 
+    private String unitName;
 
     public String getUnitCode() {
         return unitCode;
@@ -613,6 +614,14 @@ public class WmsRawOutstock extends BaseEntity {
         this.taskTypeStr = taskTypeStr;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawReturn.java

@@ -141,6 +141,7 @@ public class WmsRawReturn extends BaseEntity
 
     private String executeStatusStr;
 
+    private String unitName;
 
     /** 原材料退库记录明细信息 */
     private List<WmsRawReturnDetail> wmsRawReturnDetailList;
@@ -448,6 +449,14 @@ public class WmsRawReturn extends BaseEntity
         this.executeStatusStr = executeStatusStr;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java

@@ -161,6 +161,8 @@ public class WmsRawStock extends BaseEntity {
 
     private String saleorderCode;
 
+    private String unitName;
+
     public String getWarehouseName() {
         return warehouseName;
     }
@@ -374,6 +376,14 @@ public class WmsRawStock extends BaseEntity {
         this.saleorderCode = saleorderCode;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java

@@ -142,6 +142,7 @@ public class WmsStockTotal extends BaseEntity {
 
     private String warehouseType;
 
+    private String unitName;
 
     public String getWarehouseName() {
         return warehouseName;
@@ -408,6 +409,14 @@ public class WmsStockTotal extends BaseEntity {
         this.warehouseType = warehouseType;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsTransferDetail.java

@@ -84,6 +84,9 @@ public class WmsTransferDetail extends BaseEntity
     @Excel(name = "有效标记")
     private String activeFlag;
 
+    private String unitName;
+
+
     public void setTransferDetailId(Long transferDetailId) 
     {
         this.transferDetailId = transferDetailId;
@@ -229,6 +232,14 @@ public class WmsTransferDetail extends BaseEntity
         return activeFlag;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsInventoryCheckMapper.xml

@@ -50,6 +50,7 @@
 
         <result property="materialCode"    column="sub_material_code"    />
         <result property="materialName"    column="sub_material_name"    />
+        <result property="unitName"    column="sub_unit_name"    />
     </resultMap>
 
     <sql id="selectWmsInventoryCheckVo">
@@ -72,10 +73,11 @@
     <select id="selectWmsInventoryCheckByInventoryCheckId" parameterType="Long" resultMap="WmsInventoryCheckWmsInventoryCheckDetailResult">
         select a.inventory_check_id, a.inventory_check_code, a.warehouse_id, a.check_status, a.begin_time, a.end_time, a.location_amount, a.inventorying_amount, a.inventoried_amount, a.remark, a.create_by, a.create_date, a.update_by, a.update_date,
                b.inventory_check_detail_id as sub_inventory_check_detail_id, b.inventory_check_id as sub_inventory_check_id, b.material_id as sub_material_id, b.location_code as sub_location_code, b.material_barcode as sub_material_barcode, b.stock_type as sub_stock_type, b.stock_id as sub_stock_id, b.stock_amount as sub_stock_amount, b.real_amount as sub_real_amount, b.check_status as sub_check_status, b.inventory_time as sub_inventory_time, b.erp_status as sub_erp_status, b.erp_amount as sub_erp_amount, b.remark as sub_remark, b.create_by as sub_create_by, b.create_date as sub_create_date, b.update_by as sub_update_by, b.update_date as sub_update_date,
-               mbmi.material_code as sub_material_code,mbmi.material_name as sub_material_name
+               mbmi.material_code as sub_material_code,mbmi.material_name as sub_material_name,mbui.unit_name as sub_unit_name
         from wms_inventory_check a
                  left join wms_inventory_check_detail b on b.inventory_check_id = a.inventory_check_id
         left join mes_base_material_info mbmi on b.material_id=mbmi.material_id
+                 left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         where a.inventory_check_id = #{inventoryCheckId}
     </select>
 

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsMoveMapper.xml

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="materialCode"    column="sub_material_code"    />
         <result property="materialName"    column="sub_material_name"    />
+        <result property="unitName"    column="sub_unit_name"    />
     </resultMap>
 
     <sql id="selectWmsMoveVo">
@@ -310,10 +311,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWmsMoveJoinByMoveId" parameterType="Long" resultMap="WmsMoveWmsMoveDetailResult">
         select a.move_id, a.task_code, a.warehouse_id, a.ori_location_code, a.target_location_code, a.instock_batch, a.material_id, a.plan_amount, a.real_outstock_amount, a.real_instock_amount, a.operation_type, a.move_way, a.move_type, a.apply_reason, a.audit_reason, a.audit_status, a.execute_status, a.apply_by, a.apply_date, a.audit_by, a.audit_date, a.update_by, a.update_date, a.begin_time, a.end_time,
                b.move_detail_id as sub_move_detail_id, b.move_id as sub_move_id, b.location_code as sub_location_code, b.material_barcode as sub_material_barcode, b.instock_batch as sub_instock_batch, b.material_id as sub_material_id, b.plan_amount as sub_plan_amount, b.real_amount as sub_real_amount,b.real_instock_amount as sub_real_instock_amount, b.execute_status as sub_execute_status, b.execute_person as sub_execute_person, b.execute_time as sub_execute_time, b.machine_name as sub_machine_name, b.create_by as sub_create_by, b.create_date as sub_create_date, b.update_by as sub_update_by, b.update_date as sub_update_date,
-               mbmi.material_code as sub_material_code,mbmi.material_name as sub_material_name
+               mbmi.material_code as sub_material_code,mbmi.material_name as sub_material_name,mbui.unit_name as sub_unit_name
         from wms_move a
                  left join wms_move_detail b on b.move_id = a.move_id
                  left join mes_base_material_info mbmi on b.material_id=mbmi.material_id
+                 left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         where a.move_id = #{moveId}
     </select>
 

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
         <result property="materialSpec"    column="material_spec"    />
+        <result property="unitName"    column="unit_name"    />
     </resultMap>
 
     <resultMap id="WmsProductInstockWmsProductInstockDetailResult" type="WmsProductInstock" extends="WmsProductInstockResult">
@@ -275,7 +276,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select wpi.product_instock_id, wpi.task_code, wpi.warehouse_id, wpi.location_code, wpi.product_type,
         wpi.operation_type, wpi.plan_code, wpi.plan_detail_code, wpi.instock_type, wpi.product_id,wpi.saleorder_code,
         wpi.product_batch, wpi.instock_amount, wpi.pallet_info_code, wpi.execute_status, wpi.apply_by, wpi.apply_date,
-        wpi.erp_status, wpi.erp_amount,mbmi.material_code,mbmi.material_name,mbmi.material_spec from wms_product_instock wpi left join mes_base_material_info mbmi on wpi.product_id=mbmi.material_id
+        wpi.erp_status, wpi.erp_amount,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbui.unit_name
+        from wms_product_instock wpi
+            left join mes_base_material_info mbmi on wpi.product_id=mbmi.material_id
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
 
         <where>
             <if test="taskCode != null  and taskCode != ''"> and wpi.task_code = #{taskCode}</if>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialSpec"    column="material_spec"    />
         <result property="specificationParameter"    column="specification_parameter"    />
         <result property="unitCode"    column="unit_code"    />
+        <result property="unitName"    column="unit_name"    />
         <result property="price"    column="price"    />
         <result property="materialClassfication"    column="material_classfication"    />
 
@@ -256,9 +257,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWmsProductOutstockJoinList" parameterType="WmsProductOutstock" resultMap="WmsProductOutstockResult">
         select wpo.product_outstock_id, wpo.task_code, wpo.warehouse_id, wpo.location_code, wpo.product_type,wpo.operation_type, wpo.outstock_type,
         wpo.plan_code, wpo.plan_detail_code,wpo.saleorder_code, wpo.product_id,wpo.apply_qty,wpo.outstock_qty,wpo.apply_reason, wpo.audit_status,wpo.execute_status,wpo.apply_by, wpo.apply_date,wpo.audit_by, wpo.audit_date,wpo.erp_status,wpo.erp_amount,wpo.begin_time,wpo.end_time,
-        wbw.warehouse_name,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbmi.material_classfication
+        wbw.warehouse_name,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbmi.material_classfication,mbui.unit_name
         from wms_product_outstock wpo left join wms_base_warehouse wbw on wpo.warehouse_id =wbw.warehouse_id
         left join mes_base_material_info mbmi on wpo.product_id = mbmi.material_id
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         <where>
             <if test="taskCode != null  and taskCode != ''"> and wpo.task_code = #{taskCode}</if>
             <if test="warehouseId != null "> and wpo.warehouse_id = #{warehouseId}</if>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml

@@ -33,6 +33,7 @@
         <result property="orderAmount" column="order_amount"/>
         <result property="warehouseName" column="warehouse_name"/>
         <result property="applyAmount" column="apply_amount"/>
+        <result property="unitName" column="unit_name"/>
     </resultMap>
 
     <sql id="selectWmsProductStockVo">
@@ -61,10 +62,12 @@
                wps.update_by,
                wps.update_date,
                wps.active_flag,
-               wps.instock_date
+               wps.instock_date,
+               mbui.unit_name
         from wms_product_stock wps
                  left join wms_base_warehouse wbw on wbw.warehouse_id = wps.warehouse_id
                  left join mes_base_material_info mbmi on mbmi.material_id = wps.product_id
+                 left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
     </sql>
 
     <select id="selectWmsProductStockList" parameterType="WmsProductStock" resultMap="WmsProductStockResult">

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawInstockMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseCode"    column="warehouse_code"    />
         <result property="specificationParameter"    column="specification_parameter"    />
         <result property="srcBillNo"    column="src_bill_no"    />
+        <result property="unitName"    column="unit_name"    />
     </resultMap>
 
     <sql id="selectWmsRawInstockVo">
@@ -185,9 +186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select wri.task_code, wri.warehouse_id, wri.location_code, wri.po_no, wri.operation_type, wri.instock_type, wri.material_id,
         wri.material_barcode, wri.material_batch_code, wri.pallet_info_code, wri.instock_amount, wri.execute_status,
         wri.erp_status, wri.erp_amount, wri.apply_by, wri.apply_date, wri.machine_name, wri.quality_status, wri.update_by, wri.update_date,
-        wri.begin_time, wri.end_time,mbmi.material_code,mbmi.material_name,mbmi.material_spec
+        wri.begin_time, wri.end_time,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbui.unit_name
         from wms_raw_instock wri left join mes_base_material_info mbmi on wri.material_id=mbmi.material_id
-
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         <where>
             <if test="taskCode != null  and taskCode != ''"> and wri.task_code = #{taskCode}</if>
             <if test="warehouseId != null "> and wri.warehouse_id = #{warehouseId}</if>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="rawOutstockDetailId"    column="raw_outstock_detail_id"    />
         <result property="price"    column="price"    />
         <result property="unitCode"    column="unit_code"    />
+        <result property="unitName"    column="unit_name"    />
         <result property="specificationParameter"    column="specification_parameter"    />
     </resultMap>
 
@@ -264,9 +265,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select wro.raw_outstock_id, wro.task_code, wro.warehouse_id, wro.location_code, wro.order_id, wro.plan_code, wro.plan_detail_code, wro.station_id,wro.material_batch,
         wro.material_id, wro.operation_type, wro.task_type, wro.apply_reason, wro.audit_reason, wro.audit_status, wro.execute_status, wro.apply_by, wro.apply_date,
         wro.audit_by, wro.audit_date, wro.update_by, wro.update_date, wro.begin_time, wro.end_time,wro.outstock_amount,wro.real_outstock_amount,wbw.warehouse_name
-        ,mbmi.material_code,mbmi.material_name,mbmi.material_spec
+        ,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbui.unit_name
         from wms_raw_outstock wro left join wms_base_warehouse wbw on wro.warehouse_id = wbw.warehouse_id
          left join mes_base_material_info mbmi on wro.material_id=mbmi.material_id
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         <where>
             <if test="taskCode != null  and taskCode != ''"> and wro.task_code like concat('%', #{taskCode}, '%')</if>
             <if test="warehouseId != null "> and wro.warehouse_id = #{warehouseId}</if>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawReturnMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
         <result property="materialSpec"    column="material_spec"    />
+        <result property="unitName"    column="unit_name"    />
     </resultMap>
 
     <resultMap id="WmsRawReturnWmsRawReturnDetailResult" type="WmsRawReturn" extends="WmsRawReturnResult">
@@ -249,9 +250,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         wrr.material_id,wrr.plan_amount,wrr.return_amount,wrr.product_id,wrr.material_barcode,
         wrr.operation_type, wrr.task_type, wrr.apply_reason, wrr.audit_reason, wrr.audit_status,
         wrr.execute_status, wrr.apply_by, wrr.apply_date, wrr.audit_by, wrr.audit_date,wrr.begin_time, wrr.end_time,
-        wbw.warehouse_name,mbmi.material_code,mbmi.material_name,mbmi.material_spec
+        wbw.warehouse_name,mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbui.unit_name
         from wms_raw_return wrr left join wms_base_warehouse wbw on wrr.warehouse_id = wbw.warehouse_id
         left join mes_base_material_info mbmi on wrr.material_id=mbmi.material_id
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
 
         <where>
             <if test="taskCode != null  and taskCode != ''"> and wrr.task_code like concat('%', #{taskCode}, '%')</if>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml

@@ -33,6 +33,7 @@
         <result property="materialSpec" column="material_spec"/>
         <result property="warehouseName" column="warehouse_name"/>
         <result property="saleorderCode" column="saleorder_code"/>
+        <result property="unitName" column="unit_name"/>
     </resultMap>
 
     <sql id="selectWmsRawStockVo">
@@ -316,11 +317,13 @@
         wrs.update_by,
         wrs.update_date,
         wrs.active_flag,
-        mso.saleorder_code
+        mso.saleorder_code,
+        mbui.unit_name
         from wms_raw_stock wrs
         left join wms_base_warehouse wbw on wbw.warehouse_id = wrs.warehouse_id
         left join mes_base_material_info mbmi on mbmi.material_id = wrs.material_id
         left join mes_sale_order mso on wrs.sale_order_id = mso.sale_order_id
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         <where>
             <if test="warehouseId != null ">and wrs.warehouse_id = #{warehouseId}</if>
             <if test="locationCode != null  and locationCode != ''">and wrs.location_code = #{locationCode}</if>

hw-modules/hw-wms/src/main/resources/mapper/wms/WmsStockTotalMapper.xml

@@ -28,7 +28,7 @@
         <result property="outstockAmount" column="outstock_amount"/>
         <result property="saleorderCode" column="saleorder_code"/>
         <result property="materialClassfication" column="material_classfication"/>
-
+        <result property="unitName" column="unit_name"/>
     </resultMap>
 
     <resultMap type="WmsStockTotal" id="WmsStockTotal4ApplyResult">
@@ -265,11 +265,13 @@
         wst.update_date,
         wst.active_flag,
         mso.saleorder_code,
-        mbmi.material_classfication
+        mbmi.material_classfication,
+        mbui.unit_name
         from wms_stock_total wst
         left join wms_base_warehouse wbw on wbw.warehouse_id = wst.warehouse_id
         left join mes_base_material_info mbmi on mbmi.material_id = wst.material_id
         left join mes_sale_order mso on wst.sale_order_id = mso.sale_order_id
+        left join mes_base_unit_info mbui on mbmi.material_unit_id = mbui.erp_id
         <where>
             wst.total_amount > 0
             <if test="warehouseId != null ">and wst.warehouse_id = #{warehouseId}</if>

hw-ui/src/views/mes/barcode/index.vue

@@ -170,6 +170,7 @@
       <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[8].visible" width="100"/>
       <el-table-column label="物料规格" align="center" prop="materialSpec"/>
       <el-table-column label="规格参数" align="center" prop="barcodeSpec" v-if="columns[33].visible" width="150"/>
+      <el-table-column label="单位" align="center" prop="unitName"/>
       <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[3].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_material_batch_flag" :value="scope.row.batchFlag"/>

hw-ui/src/views/mes/materialinfo/index.vue

@@ -192,6 +192,7 @@
       </el-table-column>
       <!--      <el-table-column label="物料类型" align="center" prop="materialTypeId"/>-->
       <el-table-column label="物料类型" align="center" prop="materialTypeName"/>
+      <el-table-column label="单位" align="center" prop="unitName"/>
       <el-table-column label="常备物料" align="center" prop="alwaysFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_material_bind_flag" :value="scope.row.alwaysFlag"/>

hw-ui/src/views/wms/info/inventoryCheck/detail.vue

@@ -102,6 +102,7 @@
               <dict-tag :options="dict.type.wms_warehouse_instock_type" :value="scope.row.stockType"/>
             </template>
           </el-table-column>
+          <el-table-column label="单位" align="center" prop="unitName" />
           <el-table-column label="库存数量" align="center" prop="stockAmount" />
           <el-table-column label="盘点数量" align="center" prop="realAmount"/>
           <el-table-column label="明细状态" align="center"  prop="checkStatus">

hw-ui/src/views/wms/info/move/detail.vue

@@ -64,7 +64,7 @@
         <el-table-column label="物料条码" align="center" prop="materialBarcode" />
         <el-table-column label="物料编号" align="center" prop="materialCode" />
         <el-table-column label="物料名称" align="center" prop="materialName" />
-
+        <el-table-column label="单位" align="center" prop="unitName" />
         <el-table-column label="计划数量" align="center" prop="planAmount" />
         <el-table-column label="已出库数量" align="center" prop="realAmount" />
         <el-table-column label="已入库数量" align="center" prop="realInstockAmount" />

hw-ui/src/views/wms/info/productInstock/index.vue

@@ -131,6 +131,7 @@
       <el-table-column label="成品编码" align="center" prop="materialCode" />
       <el-table-column label="成品名称" align="center" prop="materialName" />
       <el-table-column label="成品规格" align="center" prop="materialSpec" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="入库类型" align="center" prop="instockType" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.wms_product_instock_type" :value="scope.row.instockType"/>

hw-ui/src/views/wms/info/productoutstock/index.vue

@@ -135,6 +135,7 @@
       <el-table-column label="成品编码" align="center" prop="materialCode" />
       <el-table-column label="成品名称" align="center" prop="materialName" />
       <el-table-column label="成品规格" align="center" prop="materialSpec" />
+      <el-table-column label="单位" align="center" prop="unitName" />
 
 <!--      <el-table-column label="出库目的地" align="center" prop="endStationCode" />-->
       <el-table-column label="申请数量" align="center" prop="applyQty" />

hw-ui/src/views/wms/info/rawinstock/index.vue

@@ -116,6 +116,7 @@
       <el-table-column label="物料编码" align="center" prop="materialCode" />
       <el-table-column label="物料名称" align="center" prop="materialName" />
       <el-table-column label="物料规格" align="center" prop="materialSpec" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="物料条码" align="center" prop="materialBarcode" />
       <el-table-column label="批次条码" align="center" prop="materialBatchCode" />
       <el-table-column label="托盘编码" align="center" prop="palletInfoCode" />

hw-ui/src/views/wms/info/rawoutstock/index.vue

@@ -129,6 +129,7 @@
       <el-table-column label="物料编码" align="center" prop="materialCode" />
       <el-table-column label="物料名称" align="center" prop="materialName" />
       <el-table-column label="物料规格" align="center" prop="materialSpec" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="库位编码" align="center" prop="locationCode" />
       <el-table-column label="出库类型" align="center" prop="auditStatus" >
         <template slot-scope="scope">

hw-ui/src/views/wms/info/rawreturn/index.vue

@@ -83,6 +83,7 @@
       <el-table-column label="计划明细编号" align="center" prop="planDetailCode"/>
       <el-table-column label="物料条码" align="center" prop="materialBarcode"/>
       <el-table-column label="计划退库数量" align="center" prop="planAmount"/>
+      <el-table-column label="单位" align="center" prop="unitName"/>
       <el-table-column label="退库类型" align="center" prop="taskType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.wms_raw_return_task_type" :value="scope.row.taskType"/>

hw-ui/src/views/wms/info/stocktotal/index.vue

@@ -130,6 +130,7 @@
           <el-table-column label="物料编码" align="center" prop="materialCode"/>
           <el-table-column label="物料名称" align="center" prop="materialName"/>
           <el-table-column label="物料规格" align="center" prop="materialSpec"/>
+          <el-table-column label="单位" align="center" prop="unitName"/>
           <el-table-column label="批次标识" align="center" prop="batchFlag">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.mes_material_batch_flag" :value="scope.row.batchFlag"/>
@@ -215,7 +216,7 @@
           <el-table-column label="物料编码" align="center" prop="materialCode" width="120" v-if="columns[3].visible"/>
           <el-table-column label="物料名称" align="center" prop="materialName" width="120" v-if="columns[4].visible"/>
           <el-table-column label="物料规格" align="center" prop="materialSpec" width="150" v-if="columns[16].visible"/>
-
+          <el-table-column label="单位" align="center" prop="unitName"/>
           <el-table-column label="派工单号" align="center" prop="planCode" width="100" v-if="columns[12].visible"/>
           <el-table-column label="生产明细编号" align="center" prop="planDetailCode" width="120"
                            v-if="columns[13].visible"/>