update README.md.

Signed-off-by: 心笑峰 <411641505@qq.com>

README.md

@@ -24,6 +24,7 @@
 - 当前开发进度请参考doc->开发进度->进度甘特图.xlsx
 - 第一版售前PPT请查看doc->售前资料->《苦糖果MES系统产品介绍（A4横板）.pptx》
 - 操作手册/软件说明书请参考doc->售前资料->《苦糖果生产执行管理系统-【软件说明书】.docx》
+- 完整数据库脚本请直接导入doc->实施文档->ktgmes****.sql.gz最新日期的压缩包。
 
 欢迎交流沟通：QQ：411641505
 

ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java

@@ -116,8 +116,9 @@ public class SysDeptController extends BaseController
         {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-        String s = autoCodeUtil.genSerialCode("DEPT_CODE", null);
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) {
-        dept.setDeptCode(s);
+            return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败，部门编码已存在");
+        }
         dept.setCreateBy(getUsername());
         return toAjax(deptService.insertDept(dept));
     }
@@ -132,6 +133,9 @@ public class SysDeptController extends BaseController
     {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) {
+            return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败，部门编码已存在");
+        }
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");

ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java

@@ -7,6 +7,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.ktg.common.constant.UserConstants;
 import com.ktg.mes.dv.domain.DvCheckMachinery;
 import com.ktg.mes.dv.domain.DvCheckSubject;
+import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
 import com.ktg.mes.dv.service.IDvCheckMachineryService;
 import com.ktg.mes.dv.service.IDvCheckSubjectService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -150,4 +151,14 @@ public class DvCheckPlanController extends BaseController
 
         return toAjax(dvCheckPlanService.deleteDvCheckPlanByPlanIds(planIds));
     }
+
+    /**
+     * 根据设备编码和计划类型查询设备点检计划头列表
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('mes:dv:checkplan:list')")
+    @GetMapping("/getCheckPlan")
+    public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) {
+        return dvCheckPlanService.getCheckPlan(checkPlanDTO);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.mes.dv.domain.dto.DvRepairDTO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -109,4 +110,13 @@ public class DvRepairController extends BaseController
     {
         return toAjax(dvRepairService.deleteDvRepairByRepairIds(repairIds));
     }
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     */
+    @PreAuthorize("@ss.hasPermi('mes:dv:repair:list')")
+    @GetMapping("/getRepairList")
+    public AjaxResult getRepairList(DvRepairDTO repairDTO) {
+        return dvRepairService.getRepairList(repairDTO);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java

@@ -0,0 +1,12 @@
+package com.ktg.mes.dv.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class DvCheckPlanDTO {
+
+    private String planType;
+
+    private String machineryCode;
+
+}

ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java

@@ -0,0 +1,10 @@
+package com.ktg.mes.dv.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class DvRepairDTO {
+
+    private String machineryCode;
+
+}

ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java

@@ -2,6 +2,7 @@ package com.ktg.mes.dv.mapper;
 
 import java.util.List;
 import com.ktg.mes.dv.domain.DvCheckMachinery;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 点检设备Mapper接口
@@ -67,4 +68,11 @@ public interface DvCheckMachineryMapper
      * @return
      */
     public int deleteByPlanId(Long planId);
+
+    /**
+     * 根据设备编码获取相关计划id
+     * @param machineryCode
+     * @return
+     */
+    List<Long> getPlanId(@Param("machineryCode") String machineryCode);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java

@@ -2,6 +2,8 @@ package com.ktg.mes.dv.mapper;
 
 import java.util.List;
 import com.ktg.mes.dv.domain.DvCheckPlan;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 /**
  * 设备点检计划头Mapper接口
@@ -60,4 +62,6 @@ public interface DvCheckPlanMapper
      * @return 结果
      */
     public int deleteDvCheckPlanByPlanIds(Long[] planIds);
+
+    List<DvCheckPlan> getByIds(@Param("planIds") List<Long> planIds,@Param("planType") String planType);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java

@@ -1,7 +1,9 @@
 package com.ktg.mes.dv.mapper;
 
 import java.util.List;
+
 import com.ktg.mes.dv.domain.DvRepair;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备维修单Mapper接口
@@ -61,4 +63,12 @@ public interface DvRepairMapper
      * @return 结果
      */
     public int deleteDvRepairByRepairIds(Long[] repairIds);
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     *
+     * @param machineryCode
+     * @return
+     */
+    List<DvRepair> getRepairList(@Param("machineryCode") String machineryCode);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java

@@ -67,4 +67,11 @@ public interface IDvCheckMachineryService
      * @return
      */
     public int deleteByPlanId(Long planId);
+
+    /**
+     * 根据设备编码获取相关计划id
+     * @param machineryCode
+     * @return
+     */
+    List<Long> getPlanId(String machineryCode);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java

@@ -1,7 +1,10 @@
 package com.ktg.mes.dv.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.dv.domain.DvCheckPlan;
+import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
 
 /**
  * 设备点检计划头Service接口
@@ -65,4 +68,11 @@ public interface IDvCheckPlanService
      * @return 结果
      */
     public int deleteDvCheckPlanByPlanId(Long planId);
+
+    /**
+     * 根据设备编码和计划类型查询设备点检计划头列表
+     * @return
+     */
+    AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO);
+
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java

@@ -1,7 +1,10 @@
 package com.ktg.mes.dv.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.dv.domain.DvRepair;
+import com.ktg.mes.dv.domain.dto.DvRepairDTO;
 
 /**
  * 设备维修单Service接口
@@ -65,4 +68,11 @@ public interface IDvRepairService
      * @return 结果
      */
     public int deleteDvRepairByRepairId(Long repairId);
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     * @param repairDTO
+     * @return
+     */
+    AjaxResult getRepairList(DvRepairDTO repairDTO);
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java

@@ -111,4 +111,9 @@ public class DvCheckMachineryServiceImpl implements IDvCheckMachineryService
     public int deleteByPlanId(Long planId) {
         return dvCheckMachineryMapper.deleteByPlanId(planId);
     }
+
+    @Override
+    public List<Long> getPlanId(String machineryCode) {
+        return dvCheckMachineryMapper.getPlanId(machineryCode);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java

@@ -3,8 +3,12 @@ package com.ktg.mes.dv.service.impl;
 import java.util.List;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
+import com.ktg.mes.dv.service.IDvCheckMachineryService;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.dv.mapper.DvCheckPlanMapper;
@@ -23,6 +27,9 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService
     @Autowired
     private DvCheckPlanMapper dvCheckPlanMapper;
 
+    @Autowired
+    private IDvCheckMachineryService dvCheckMachineryService;
+
     /**
      * 查询设备点检计划头
      * 
@@ -106,4 +113,20 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService
     {
         return dvCheckPlanMapper.deleteDvCheckPlanByPlanId(planId);
     }
+
+    /**
+     * 根据设备编码和计划类型查询设备点检计划头列表
+     * @return
+     */
+    @Override
+    public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) {
+        // 根据设备编码获取相关计划id
+        List<Long> planIds =  dvCheckMachineryService.getPlanId(checkPlanDTO.getMachineryCode());
+        if (planIds != null && planIds.size() > 0) {
+            // 根据设备编码和计划类型获取相关设备点检计划头列表
+            List<DvCheckPlan> list = dvCheckPlanMapper.getByIds(planIds, checkPlanDTO.getPlanType());
+            return AjaxResult.success(list);
+        }
+        return AjaxResult.success();
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java

@@ -3,8 +3,10 @@ package com.ktg.mes.dv.service.impl;
 import java.util.List;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.dv.domain.dto.DvRepairDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.dv.mapper.DvRepairMapper;
@@ -106,4 +108,15 @@ public class DvRepairServiceImpl implements IDvRepairService
     {
         return dvRepairMapper.deleteDvRepairByRepairId(repairId);
     }
+
+    /**
+     * 根据设备编码查询设备维修单列表
+     * @param repairDTO
+     * @return
+     */
+    @Override
+    public AjaxResult getRepairList(DvRepairDTO repairDTO) {
+        List<DvRepair> list = dvRepairMapper.getRepairList(repairDTO.getMachineryCode());
+        return AjaxResult.success(list);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java

@@ -43,6 +43,9 @@ public class MdProductBom extends BaseEntity
     @Excel(name = "BOM物料单位")
     private String unitOfMeasure;
 
+    /** BOM物料单位名称 */
+    private String unitName;
+
     /** 产品物料标识 */
     @Excel(name = "产品物料标识")
     private String itemOrProduct;
@@ -67,6 +70,14 @@ public class MdProductBom extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setBomId(Long bomId)
     {
         this.bomId = bomId;
@@ -204,6 +215,7 @@ public class MdProductBom extends BaseEntity
             .append("bomItemName", getBomItemName())
             .append("bomItemSpec", getBomItemSpec())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("itemOrProduct", getItemOrProduct())
             .append("quantity", getQuantity())
             .append("enableFlag", getEnableFlag())

ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java

@@ -35,6 +35,9 @@ public class MdWorkshop extends BaseEntity
     @Excel(name = "负责人")
     private String charge;
 
+    /** 负责人id */
+    private Long chargeId;
+
     /** 是否启用 */
     @Excel(name = "是否启用")
     private String enableFlag;
@@ -51,6 +54,14 @@ public class MdWorkshop extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public Long getChargeId() {
+        return chargeId;
+    }
+
+    public void setChargeId(Long chargeId) {
+        this.chargeId = chargeId;
+    }
+
     public void setWorkshopId(Long workshopId)
     {
         this.workshopId = workshopId;
@@ -150,6 +161,7 @@ public class MdWorkshop extends BaseEntity
             .append("workshopName", getWorkshopName())
             .append("area", getArea())
             .append("charge", getCharge())
+            .append("chargeId", getChargeId())
             .append("enableFlag", getEnableFlag())
             .append("remark", getRemark())
             .append("attr1", getAttr1())

ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java

@@ -228,6 +228,7 @@ public class ProWorkorderController extends BaseController
                 theBom.setBomItemCode(bom.getItemCode());
                 theBom.setItemOrProduct(bom.getItemOrProduct());
                 theBom.setUnitOfMeasure(bom.getUnitOfMeasure());
+                theBom.setUnitName(bom.getUnitName());
                 theBom.setBomItemSpec(bom.getItemSpc());
                 theBom.setQuantity(bom.getQuantity());
                 result.addAll(getBoms(theBom,bom.getQuantity(),0));

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java

@@ -62,6 +62,9 @@ public class ProCard extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 赋码地址 */
     @Excel(name = "赋码地址")
     private String barcodeUrl;
@@ -97,6 +100,13 @@ public class ProCard extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date inputTime;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
 
     public void setCardId(Long cardId)
     {
@@ -291,6 +301,7 @@ public class ProCard extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("barcodeUrl", getBarcodeUrl())
             .append("quantityTransfered", getQuantityTransfered())
             .append("status", getStatus())

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java

@@ -43,6 +43,9 @@ public class ProRouteProduct extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 生产数量 */
     @Excel(name = "生产数量")
     private Long quantity;
@@ -67,6 +70,14 @@ public class ProRouteProduct extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
@@ -204,6 +215,7 @@ public class ProRouteProduct extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantity", getQuantity())
             .append("productionTime", getProductionTime())
             .append("timeUnitType", getTimeUnitType())

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java

@@ -63,6 +63,9 @@ public class ProWorkorder extends TreeEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 批次号 */
     @Excel(name = "批次号")
     private String batchCode;
@@ -136,6 +139,14 @@ public class ProWorkorder extends TreeEntity
 
     private List<ProTask> tasks;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setWorkorderId(Long workorderId)
     {
         this.workorderId = workorderId;
@@ -416,6 +427,7 @@ public class ProWorkorder extends TreeEntity
                 ", productName='" + productName + '\'' +
                 ", productSpc='" + productSpc + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", batchCode='" + batchCode + '\'' +
                 ", quantity=" + quantity +
                 ", quantityProduced=" + quantityProduced +

ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java

@@ -43,6 +43,9 @@ public class ProWorkorderBom extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 物料产品标识 */
     @Excel(name = "物料产品标识")
     private String itemOrProduct;
@@ -63,6 +66,14 @@ public class ProWorkorderBom extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -191,6 +202,7 @@ public class ProWorkorderBom extends BaseEntity
             .append("itemName", getItemName())
             .append("itemSpc", getItemSpc())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("itemOrProduct", getItemOrProduct())
             .append("quantity", getQuantity())
             .append("remark", getRemark())

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java

@@ -115,6 +115,9 @@ public class QcIpqc extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 检测数量 */
     @Excel(name = "检测数量")
     private BigDecimal quantityCheck;
@@ -180,6 +183,14 @@ public class QcIpqc extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setIpqcId(Long ipqcId)
     {
         this.ipqcId = ipqcId;
@@ -590,6 +601,7 @@ public class QcIpqc extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName=", getUnitName())
             .append("quantityCheck", getQuantityCheck())
             .append("quantityUnqualified", getQuantityUnqualified())
             .append("quantityQualified", getQuantityQualified())

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java

@@ -84,6 +84,9 @@ public class QcIqc extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 最低检测数 */
     @Excel(name = "最低检测数")
     private BigDecimal quantityMinCheck;
@@ -170,6 +173,14 @@ public class QcIqc extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setIqcId(Long iqcId)
     {
         this.iqcId = iqcId;
@@ -544,6 +555,7 @@ public class QcIqc extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + "\'" +
                 ", quantityMinCheck=" + quantityMinCheck +
                 ", quantityMaxUnqualified=" + quantityMaxUnqualified +
                 ", quantityRecived=" + quantityRecived +

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java

@@ -43,6 +43,9 @@ public class QcTemplateProduct extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 最低检测数 */
     @Excel(name = "最低检测数")
     private Long quantityCheck;
@@ -75,6 +78,14 @@ public class QcTemplateProduct extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
@@ -230,6 +241,7 @@ public class QcTemplateProduct extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityCheck", getQuantityCheck())
             .append("quantityUnqualified", getQuantityUnqualified())
             .append("crRate", getCrRate())

ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageAreaController.java

@@ -106,8 +106,6 @@ public class WmStorageAreaController extends BaseController
 	@DeleteMapping("/{areaIds}")
     public AjaxResult remove(@PathVariable Long[] areaIds)
     {
-        //TODO:库位删除之前的逻辑校验
+        return wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds);
-
-        return toAjax(wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds));
     }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java

@@ -112,12 +112,6 @@ public class WmStorageLocationController extends BaseController
 	@DeleteMapping("/{locationIds}")
     public AjaxResult remove(@PathVariable Long[] locationIds)
     {
-//        //TODO:库区删除之前的逻辑校验
-//
-//        for (Long locationId: locationIds
-//             ) {
-//            wmStorageAreaService.deleteByLocationId(locationId);
-//        }
         return wmStorageLocationService.deleteWmStorageLocationByLocationIds(locationIds);
     }
 

ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java

@@ -139,15 +139,6 @@ public class WmWarehouseController extends BaseController
 	@DeleteMapping("/{warehouseIds}")
     public AjaxResult remove(@PathVariable Long[] warehouseIds)
     {
-
+        return wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds);
-        //TODO:仓库删除之前的逻辑校验
-
-        for (Long wahouseId: warehouseIds
-             ) {
-            wmStorageLocationService.deleteByWarehouseId(wahouseId);
-            wmStorageAreaService.deleteByWarehouseId(wahouseId);
-        }
-
-        return toAjax(wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds));
     }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java

@@ -43,6 +43,9 @@ public class WmArrivalNoticeLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 到货数量 */
     @Excel(name = "到货数量")
     private BigDecimal quantityArrival;
@@ -75,6 +78,14 @@ public class WmArrivalNoticeLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java

@@ -45,6 +45,9 @@ public class WmIssueLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 领料数量 */
     @Excel(name = "领料数量")
     private BigDecimal quantityIssued;
@@ -101,6 +104,14 @@ public class WmIssueLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -318,6 +329,7 @@ public class WmIssueLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityIssued", getQuantityIssued())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java

@@ -50,6 +50,9 @@ public class WmItemRecptLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 入库数量 */
     @Excel(name = "入库数量")
     private BigDecimal quantityRecived;
@@ -126,6 +129,14 @@ public class WmItemRecptLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -369,6 +380,7 @@ public class WmItemRecptLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantityRecived=" + quantityRecived +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java

@@ -47,6 +47,9 @@ public class WmOutsourceIssueLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 领料数量 */
     @Excel(name = "领料数量")
     private BigDecimal quantityIssued;
@@ -103,6 +106,14 @@ public class WmOutsourceIssueLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -322,6 +333,7 @@ public class WmOutsourceIssueLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityIssued", getQuantityIssued())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java

@@ -45,6 +45,9 @@ public class WmOutsourceRecptLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 入库数量 */
     @Excel(name = "入库数量")
     private BigDecimal quantityRecived;
@@ -118,6 +121,14 @@ public class WmOutsourceRecptLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -363,6 +374,7 @@ public class WmOutsourceRecptLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityRecived", getQuantityRecived())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java

@@ -49,6 +49,9 @@ public class WmPackageLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 装箱数量 */
     @Excel(name = "装箱数量")
     private BigDecimal quantityPackage;
@@ -118,6 +121,14 @@ public class WmPackageLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -364,6 +375,7 @@ public class WmPackageLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityPackage", getQuantityPackage())
             .append("workorderId", getWorkorderId())
             .append("workorderCode", getWorkorderCode())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java

@@ -50,6 +50,9 @@ public class WmProductRecptLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 入库数量 */
     @Excel(name = "入库数量")
     private BigDecimal quantityRecived;
@@ -111,6 +114,14 @@ public class WmProductRecptLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -339,6 +350,7 @@ public class WmProductRecptLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantityRecived=" + quantityRecived +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java

@@ -47,6 +47,9 @@ public class WmProductSalseLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 出库数量 */
     @Excel(name = "出库数量")
     private BigDecimal quantitySalse;
@@ -118,6 +121,14 @@ public class WmProductSalseLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -362,6 +373,7 @@ public class WmProductSalseLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantitySalse=" + quantitySalse +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java

@@ -47,6 +47,9 @@ public class WmRtIssueLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 退料数量 */
     @Excel(name = "退料数量")
     private BigDecimal quantityRt;
@@ -103,6 +106,14 @@ public class WmRtIssueLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -322,6 +333,7 @@ public class WmRtIssueLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityRt", getQuantityRt())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java

@@ -45,6 +45,9 @@ public class WmRtSalseLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 退货数量 */
     @Excel(name = "退货数量")
     private BigDecimal quantityRted;
@@ -106,6 +109,14 @@ public class WmRtSalseLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -324,6 +335,7 @@ public class WmRtSalseLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityRted", getQuantityRted())
             .append("batchCode", getBatchCode())
             .append("warehouseId", getWarehouseId())

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java

@@ -45,6 +45,9 @@ public class WmRtVendorLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 退货数量 */
     @Excel(name = "退货数量")
     private BigDecimal quantityRted;
@@ -101,6 +104,14 @@ public class WmRtVendorLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -320,6 +331,7 @@ public class WmRtVendorLine extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", quantityRted=" + quantityRted +
                 ", batchCode='" + batchCode + '\'' +
                 ", warehouseId=" + warehouseId +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java

@@ -45,6 +45,9 @@ public class WmSn extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 批次号 */
     @Excel(name = "批次号")
     private String batchCode;
@@ -80,6 +83,14 @@ public class WmSn extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setSnId(Long snId)
     {
         this.snId = snId;
@@ -249,6 +260,7 @@ public class WmSn extends BaseEntity
                 ", itemName='" + itemName + '\'' +
                 ", specification='" + specification + '\'' +
                 ", unitOfMeasure='" + unitOfMeasure + '\'' +
+                ", unitName='" + unitName + '\'' +
                 ", batchCode='" + batchCode + '\'' +
                 ", snNum=" + snNum +
                 ", genDate=" + genDate +

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java

@@ -49,6 +49,9 @@ public class WmTransferLine extends BaseEntity
     @Excel(name = "单位")
     private String unitOfMeasure;
 
+    /** 单位名称 */
+    private String unitName;
+
     /** 装箱数量 */
     @Excel(name = "装箱数量")
     private BigDecimal quantityTransfer;
@@ -170,6 +173,14 @@ public class WmTransferLine extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public void setLineId(Long lineId)
     {
         this.lineId = lineId;
@@ -533,6 +544,7 @@ public class WmTransferLine extends BaseEntity
             .append("itemName", getItemName())
             .append("specification", getSpecification())
             .append("unitOfMeasure", getUnitOfMeasure())
+            .append("unitName", getUnitName())
             .append("quantityTransfer", getQuantityTransfer())
             .append("workorderId", getWorkorderId())
             .append("workorderCode", getWorkorderCode())

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java

@@ -1,6 +1,7 @@
 package com.ktg.mes.wm.mapper;
 
 import com.ktg.mes.wm.domain.WmMaterialStock;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -70,4 +71,20 @@ public interface WmMaterialStockMapper
      * @return 结果
      */
     public int deleteWmMaterialStockByMaterialStockIds(Long[] materialStockIds);
+
+    /**
+     * 根据库位id查询相关库存现有量数据
+     * @param areaId
+     * @return
+     */
+    List<WmMaterialStock> getByAreaId(@Param("areaId") Long areaId);
+
+    /**
+     * 根据库区id查询相关库存现有量
+     * @param locationId
+     * @return
+     */
+    List<WmMaterialStock> getLocationId(@Param("locationId") Long locationId);
+
+    List<WmMaterialStock> getByWarehouseId(@Param("warehouseId") Long warehouseId);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java

@@ -2,6 +2,7 @@ package com.ktg.mes.wm.mapper;
 
 import java.util.List;
 import com.ktg.mes.wm.domain.WmStorageArea;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 库位设置Mapper接口
@@ -90,4 +91,8 @@ public interface WmStorageAreaMapper
      * @return
      */
     public int deleteByLocationId(Long locationId);
+
+    List<WmStorageArea> selectByAreaIds(@Param("ids") Long[] areaIds);
+
+    int deleteByLocationIds(@Param("ids") Long[] locationIds);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java

@@ -2,6 +2,7 @@ package com.ktg.mes.wm.mapper;
 
 import java.util.List;
 import com.ktg.mes.wm.domain.WmWarehouse;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 仓库设置Mapper接口
@@ -72,4 +73,10 @@ public interface WmWarehouseMapper
      */
     public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
 
+    /**
+     * 根据仓库id查询相关仓库数据
+     * @param warehouseIds
+     * @return
+     */
+    List<WmWarehouse> selectByWarehouseId(@Param("ids") Long[] warehouseIds);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java

@@ -71,4 +71,25 @@ public interface IWmMaterialStockService
      * @return 结果
      */
     public int deleteWmMaterialStockByMaterialStockId(Long materialStockId);
+
+    /**
+     * 根据库位id查询相关库存现有量数据
+     * @param areaId
+     * @return
+     */
+    List<WmMaterialStock> getByAreaId(Long areaId);
+
+    /**
+     * 根据库区id查询相关库存现有量
+     * @param locationId
+     * @return
+     */
+    List<WmMaterialStock> getLocationId(Long locationId);
+
+    /**
+     * 根据仓库id查询相关库存现有量
+     * @param warehouseId
+     * @return
+     */
+    List<WmMaterialStock> getByWarehouseId(Long warehouseId);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java

@@ -1,6 +1,8 @@
 package com.ktg.mes.wm.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.wm.domain.WmStorageArea;
 
 /**
@@ -71,7 +73,7 @@ public interface IWmStorageAreaService
      * @param areaIds 需要删除的库位设置主键集合
      * @return 结果
      */
-    public int deleteWmStorageAreaByAreaIds(Long[] areaIds);
+    public AjaxResult deleteWmStorageAreaByAreaIds(Long[] areaIds);
 
     /**
      * 删除库位设置信息
@@ -94,4 +96,12 @@ public interface IWmStorageAreaService
      * @return
      */
     public int deleteByLocationId(Long locationId);
+
+    /**
+     * 根据库区ids删除相关的库位数据
+     *
+     * @param locationIds
+     * @return
+     */
+    int deleteByLocationIds(Long[] locationIds);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java

@@ -1,6 +1,8 @@
 package com.ktg.mes.wm.service;
 
 import java.util.List;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.mes.wm.domain.WmWarehouse;
 
 /**
@@ -72,7 +74,7 @@ public interface IWmWarehouseService
      * @param warehouseIds 需要删除的仓库设置主键集合
      * @return 结果
      */
-    public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
+    public AjaxResult deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
 
     /**
      * 删除仓库设置信息

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmMaterialStockServiceImpl.java

@@ -100,4 +100,34 @@ public class WmMaterialStockServiceImpl implements IWmMaterialStockService
     {
         return wmMaterialStockMapper.deleteWmMaterialStockByMaterialStockId(materialStockId);
     }
+
+    /**
+     * 根据库位id查询相关库存现有量数据
+     * @param areaId
+     * @return
+     */
+    @Override
+    public List<WmMaterialStock> getByAreaId(Long areaId) {
+        return wmMaterialStockMapper.getByAreaId(areaId);
+    }
+
+    /**
+     * 根据库区id查询相关库存现有量
+     * @param locationId
+     * @return
+     */
+    @Override
+    public List<WmMaterialStock> getLocationId(Long locationId) {
+        return wmMaterialStockMapper.getLocationId(locationId);
+    }
+
+    /**
+     * 根据仓库id查询相关库存现有量
+     * @param warehouseId
+     * @return
+     */
+    @Override
+    public List<WmMaterialStock> getByWarehouseId(Long warehouseId) {
+        return wmMaterialStockMapper.getByWarehouseId(warehouseId);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java

@@ -1,7 +1,14 @@
 package com.ktg.mes.wm.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.wm.domain.WmMaterialStock;
+import com.ktg.mes.wm.service.IWmMaterialStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
@@ -20,6 +27,9 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
     @Autowired
     private WmStorageAreaMapper wmStorageAreaMapper;
 
+    @Autowired
+    private IWmMaterialStockService wmMaterialStockService;
+
     /**
      * 查询库位设置
      * 
@@ -98,9 +108,34 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
      * @return 结果
      */
     @Override
-    public int deleteWmStorageAreaByAreaIds(Long[] areaIds)
+    public AjaxResult deleteWmStorageAreaByAreaIds(Long[] areaIds)
     {
-        return wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds);
+        // 查询所有删除数据
+        List<WmStorageArea> areaList = wmStorageAreaMapper.selectByAreaIds(areaIds);
+        for (WmStorageArea item : areaList) {
+            String areaCode = item.getAreaCode();
+            if (areaCode.contains("VIRTUAL")) {
+                return AjaxResult.error("虚拟库位不能删除");
+            }
+        }
+
+        // 校验库位中是否存在物料
+        for (Long areaId : areaIds) {
+            // 根据库位查询相关数据
+            List<WmMaterialStock> list = wmMaterialStockService.getByAreaId(areaId);
+            if (list != null && list.size() > 0) {
+                Map<Long, List<WmMaterialStock>> collect = list.stream()
+                        .collect(Collectors.groupingBy(WmMaterialStock::getItemId));
+                for (Long l : collect.keySet()) {
+                    List<WmMaterialStock> wmMaterialStocks = collect.get(l);
+                    BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
+                        return AjaxResult.error("库位中还有库存不能删除");
+                    }
+                }
+            }
+        }
+        return AjaxResult.success(wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds));
     }
 
     /**
@@ -124,4 +159,9 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
     public int deleteByLocationId(Long locationId) {
         return wmStorageAreaMapper.deleteByLocationId(locationId);
     }
+
+    @Override
+    public int deleteByLocationIds(Long[] locationIds) {
+        return wmStorageAreaMapper.deleteByLocationIds(locationIds);
+    }
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java

@@ -1,17 +1,23 @@
 package com.ktg.mes.wm.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.ktg.common.constant.UserConstants;
 import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.wm.domain.WmMaterialStock;
+import com.ktg.mes.wm.service.IWmMaterialStockService;
 import com.ktg.mes.wm.service.IWmStorageAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
 import com.ktg.mes.wm.domain.WmStorageLocation;
 import com.ktg.mes.wm.service.IWmStorageLocationService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 库区设置Service业务层处理
@@ -28,6 +34,9 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
     @Autowired
     private IWmStorageAreaService wmStorageAreaService;
 
+    @Autowired
+    private IWmMaterialStockService wmMaterialStockService;
+
     /**
      * 查询库区设置
      * 
@@ -110,6 +119,7 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
      * @return 结果
      */
     @Override
+    @Transactional
     public AjaxResult deleteWmStorageLocationByLocationIds(Long[] locationIds)
     {
         // 查询所有需要删除的数据
@@ -117,14 +127,27 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
         for (WmStorageLocation item : list) {
             String locationCode = item.getLocationCode();
             if (locationCode.contains("VIRTUAL")) {
-                return AjaxResult.error("线边库库区不能被删除");
+                return AjaxResult.error("虚拟库区不能被删除");
             }
         }
-
+        // 校验库区中是否存在物料
-        for (Long locationId: locationIds
+        for (Long locationId : locationIds) {
-        ) {
+            // 根据库区查询相关数据
-            wmStorageAreaService.deleteByLocationId(locationId);
+            List<WmMaterialStock> materialStocks = wmMaterialStockService.getLocationId(locationId);
+            if (materialStocks != null && materialStocks.size() > 0) {
+                Map<Long, List<WmMaterialStock>> collect = materialStocks.stream()
+                        .collect(Collectors.groupingBy(WmMaterialStock::getItemId));
+                for (Long l : collect.keySet()) {
+                    List<WmMaterialStock> wmMaterialStocks = collect.get(l);
+                    BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
+                        return AjaxResult.error("库区中还有库存不能删除");
+                    }
+                }
+            }
         }
+        // 关联删除相关库位
+        wmStorageAreaService.deleteByLocationIds(locationIds);
         wmStorageLocationMapper.deleteWmStorageLocationByLocationIds(locationIds);
         return AjaxResult.success();
     }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java

@@ -1,21 +1,28 @@
 package com.ktg.mes.wm.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.ktg.common.constant.UserConstants;
+import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.wm.domain.WmMaterialStock;
 import com.ktg.mes.wm.domain.WmStorageArea;
 import com.ktg.mes.wm.domain.WmStorageLocation;
 import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
 import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
-import org.apache.catalina.User;
+import com.ktg.mes.wm.service.IWmMaterialStockService;
-import org.checkerframework.checker.units.qual.A;
+import com.ktg.mes.wm.service.IWmStorageAreaService;
+import com.ktg.mes.wm.service.IWmStorageLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.wm.mapper.WmWarehouseMapper;
 import com.ktg.mes.wm.domain.WmWarehouse;
 import com.ktg.mes.wm.service.IWmWarehouseService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 仓库设置Service业务层处理
@@ -35,6 +42,15 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService
     @Autowired
     private WmStorageAreaMapper wmStorageAreaMapper;
 
+    @Autowired
+    private IWmMaterialStockService wmMaterialStockService;
+
+    @Autowired
+    private IWmStorageLocationService wmStorageLocationService;
+
+    @Autowired
+    private IWmStorageAreaService wmStorageAreaService;
+
     /**
      * 查询仓库设置
      * 
@@ -122,9 +138,38 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService
      * @return 结果
      */
     @Override
-    public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds)
+    @Transactional
+    public AjaxResult deleteWmWarehouseByWarehouseIds(Long[] warehouseIds)
     {
-        return wmWarehouseMapper.deleteWmWarehouseByWarehouseIds(warehouseIds);
+        // 查询所有需要删除的数据
+        List<WmWarehouse> warehouseList = wmWarehouseMapper.selectByWarehouseId(warehouseIds);
+        for (WmWarehouse item : warehouseList) {
+            String warehouseCode = item.getWarehouseCode();
+            if (warehouseCode.contains("VIRTUAL")) {
+                return AjaxResult.error("虚拟仓库不能被删除");
+            }
+        }
+        // 校验仓库中是否存在物料
+        for (Long warehouseId : warehouseIds) {
+            // 根据仓库id查询相关数据
+            List<WmMaterialStock> materialStocks = wmMaterialStockService.getByWarehouseId(warehouseId);
+            if (materialStocks != null && materialStocks.size() > 0) {
+                Map<Long, List<WmMaterialStock>> collect = materialStocks.stream()
+                        .collect(Collectors.groupingBy(WmMaterialStock::getItemId));
+                for (Long l : collect.keySet()) {
+                    List<WmMaterialStock> wmMaterialStocks = collect.get(l);
+                    BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
+                        return AjaxResult.error("库区中还有库存不能删除");
+                    }
+                }
+            }
+        }
+        for (Long wahouseId: warehouseIds) {
+            wmStorageAreaService.deleteByWarehouseId(wahouseId);
+            wmStorageLocationService.deleteByWarehouseId(wahouseId);
+        }
+        return AjaxResult.success(wmWarehouseMapper.deleteWmWarehouseByWarehouseIds(warehouseIds));
     }
 
     /**

ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml

@@ -55,6 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where plan_id = #{planId}
         )  limit 1
     </select>
+    <select id="getPlanId" resultType="java.lang.Long">
+        select plan_id from dv_check_machinery
+        where machinery_code = #{machineryCode}
+    </select>
 
     <insert id="insertDvCheckMachinery" parameterType="DvCheckMachinery" useGeneratedKeys="true" keyProperty="recordId">
         insert into dv_check_machinery

ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml

@@ -52,6 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDvCheckPlanVo"/>
         where plan_code = #{planCode}
     </select>
+    <select id="getByIds" resultType="com.ktg.mes.dv.domain.DvCheckPlan" resultMap="DvCheckPlanResult">
+        <include refid="selectDvCheckPlanVo"/>
+        where plan_type = #{planType}
+        and plan_id in
+            <foreach collection="planIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+    </select>
 
     <insert id="insertDvCheckPlan" parameterType="DvCheckPlan" useGeneratedKeys="true" keyProperty="planId">
         insert into dv_check_plan

ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml

@@ -66,6 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDvRepairVo"/>
         where repair_code = #{repairCode} limit 1
     </select>
+    <select id="getRepairList" resultType="com.ktg.mes.dv.domain.DvRepair" resultMap="DvRepairResult">
+        <include refid="selectDvRepairVo"/>
+        where machinery_code = #{machineryCode}
+    </select>
 
     <insert id="insertDvRepair" parameterType="DvRepair" useGeneratedKeys="true" keyProperty="repairId">
         insert into dv_repair

ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bomItemName"    column="bom_item_name"    />
         <result property="bomItemSpec"    column="bom_item_spec"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="itemOrProduct"    column="item_or_product"    />
         <result property="quantity"    column="quantity"    />
         <result property="enableFlag"    column="enable_flag"    />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMdProductBomVo">
-        select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
+        select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, unit_name, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
     </sql>
 
     <select id="selectMdProductBomList" parameterType="MdProductBom" resultMap="MdProductBomResult">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null  and bomItemName != ''"> and bom_item_name like concat('%', #{bomItemName}, '%')</if>
             <if test="bomItemSpec != null  and bomItemSpec != ''"> and bom_item_spec = #{bomItemSpec}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="itemOrProduct != null  and itemOrProduct != ''"> and item_or_product = #{itemOrProduct}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="enableFlag != null  and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
@@ -62,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null and bomItemName != ''">bom_item_name,</if>
             <if test="bomItemSpec != null">bom_item_spec,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">item_or_product,</if>
             <if test="quantity != null">quantity,</if>
             <if test="enableFlag != null and enableFlag != ''">enable_flag,</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null and bomItemName != ''">#{bomItemName},</if>
             <if test="bomItemSpec != null">#{bomItemSpec},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">#{itemOrProduct},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="enableFlag != null and enableFlag != ''">#{enableFlag},</if>
@@ -106,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bomItemName != null and bomItemName != ''">bom_item_name = #{bomItemName},</if>
             <if test="bomItemSpec != null">bom_item_spec = #{bomItemSpec},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">item_or_product = #{itemOrProduct},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="enableFlag != null and enableFlag != ''">enable_flag = #{enableFlag},</if>

ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMdWorkshopVo">
-        select workshop_id, workshop_code, workshop_name, area, charge, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
+        select workshop_id, workshop_code, workshop_name, area, charge, charge_id, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
     </sql>
 
     <select id="selectMdWorkshopList" parameterType="MdWorkshop" resultMap="MdWorkshopResult">

ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="barcodeUrl"    column="barcode_url"    />
         <result property="quantityTransfered"    column="quantity_transfered"    />
         <result property="status"    column="status"    />
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProCardVo">
-        select card_id, card_code, workorder_id, workorder_code, workorder_name, batch_code, item_id, item_code, item_name, specification, unit_of_measure, barcode_url, quantity_transfered, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_card
+        select card_id, card_code, workorder_id, workorder_code, workorder_name, batch_code, item_id, item_code, item_name, specification, unit_of_measure, unit_name, barcode_url, quantity_transfered, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_card
     </sql>
 
     <select id="selectProCardList" parameterType="ProCard" resultMap="ProCardResult">
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+             <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="barcodeUrl != null  and barcodeUrl != ''"> and barcode_url = #{barcodeUrl}</if>
             <if test="quantityTransfered != null "> and quantity_transfered = #{quantityTransfered}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
@@ -65,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getStationList" parameterType="ProCard" resultMap="ProCardResult">
-        select pc.card_id,pc.card_code,pc.workorder_id,pc.workorder_code,pc.workorder_name,pc.item_id,pc.item_code,pc.item_name,pc.specification, pc.unit_of_measure,pc.quantity_transfered,
+        select pc.card_id,pc.card_code,pc.workorder_id,pc.workorder_code,pc.workorder_name,pc.item_id,pc.item_code,pc.item_name,pc.specification, pc.unit_of_measure,pc.unit_name,pc.quantity_transfered,
                pcp.record_id,pcp.workstation_id,pcp.input_time
         from pro_card pc
                  left join pro_card_process pcp
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="barcodeUrl != null">barcode_url,</if>
             <if test="quantityTransfered != null">quantity_transfered,</if>
             <if test="status != null">status,</if>
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="barcodeUrl != null">#{barcodeUrl},</if>
             <if test="quantityTransfered != null">#{quantityTransfered},</if>
             <if test="status != null">#{status},</if>
@@ -146,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="barcodeUrl != null">barcode_url = #{barcodeUrl},</if>
             <if test="quantityTransfered != null">quantity_transfered = #{quantityTransfered},</if>
             <if test="status != null">status = #{status},</if>

ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantity"    column="quantity"    />
         <result property="productionTime"    column="production_time"    />
         <result property="timeUnitType"    column="time_unit_type"    />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProRouteProductVo">
-        select record_id, route_id, item_id, item_code, item_name, specification, unit_of_measure, quantity, production_time, time_unit_type, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
+        select record_id, route_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity, production_time, time_unit_type, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
     </sql>
 
 
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+             <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="productionTime != null "> and production_time = #{productionTime}</if>
             <if test="timeUnitType != null  and timeUnitType != ''"> and time_unit_type = #{timeUnitType}</if>
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantity != null">quantity,</if>
             <if test="productionTime != null">production_time,</if>
             <if test="timeUnitType != null">time_unit_type,</if>
@@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="productionTime != null">#{productionTime},</if>
             <if test="timeUnitType != null">#{timeUnitType},</if>
@@ -116,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="productionTime != null">production_time = #{productionTime},</if>
             <if test="timeUnitType != null">time_unit_type = #{timeUnitType},</if>

ktg-mes/src/main/resources/mapper/pro/ProWorkorderBomMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="itemSpc"    column="item_spc"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="itemOrProduct"    column="item_or_product"    />
         <result property="quantity"    column="quantity"    />
         <result property="remark"    column="remark"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProWorkorderBomVo">
-        select line_id, workorder_id, item_id, item_code, item_name, item_spc, unit_of_measure, item_or_product, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder_bom
+        select line_id, workorder_id, item_id, item_code, item_name, item_spc, unit_of_measure, unit_name, item_or_product, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder_bom
     </sql>
 
     <select id="selectProWorkorderBomList" parameterType="ProWorkorderBom" resultMap="ProWorkorderBomResult">
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="itemSpc != null  and itemSpc != ''"> and item_spc = #{itemSpc}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="itemOrProduct != null  and itemOrProduct != ''"> and item_or_product = #{itemOrProduct}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
         </where>
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">item_name,</if>
             <if test="itemSpc != null">item_spc,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">item_or_product,</if>
             <if test="quantity != null">quantity,</if>
             <if test="remark != null">remark,</if>
@@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">#{itemName},</if>
             <if test="itemSpc != null">#{itemSpc},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">#{itemOrProduct},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="remark != null">#{remark},</if>
@@ -99,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
             <if test="itemSpc != null">item_spc = #{itemSpc},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="itemOrProduct != null and itemOrProduct != ''">item_or_product = #{itemOrProduct},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="remark != null">remark = #{remark},</if>

ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productName"    column="product_name"    />
         <result property="productSpc"    column="product_spc"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="batchCode" column="batch_code"></result>
         <result property="quantity"    column="quantity"    />
         <result property="quantityProduced"    column="quantity_produced"    />
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProWorkorderVo">
-        select workorder_id, workorder_code, workorder_name, workorder_type, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure,batch_code, quantity,quantity_produced, client_id, client_code, client_name, vendor_id, vendor_code, vendor_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
+        select workorder_id, workorder_code, workorder_name, workorder_type, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure, unit_name, batch_code, quantity,quantity_produced, client_id, client_code, client_name, vendor_id, vendor_code, vendor_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
     </sql>
 
     <select id="selectProWorkorderList" parameterType="ProWorkorder" resultMap="ProWorkorderResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="productSpc != null  and productSpc != ''"> and product_spc = #{productSpc}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="batchCode !=null and batchCode !=''" >and batch_code = #{batchCode}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="quantityProduced != null "> and quantity_produced = #{quantityProduced}</if>
@@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null and productName != ''">product_name,</if>
             <if test="productSpc != null">product_spc,</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="batchCode !=null and batchCode !=''" >batch_code,</if>
             <if test="quantity != null">quantity,</if>
             <if test="quantityProduced != null">quantity_produced,</if>
@@ -145,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null and productName != ''">#{productName},</if>
             <if test="productSpc != null">#{productSpc},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="batchCode !=null and batchCode !=''" >#{batchCode},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="quantityProduced != null">#{quantityProduced},</if>
@@ -186,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null and productName != ''">product_name = #{productName},</if>
             <if test="productSpc != null">product_spc = #{productSpc},</if>
             <if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="batchCode !=null and batchCode !=''" >batch_code = #{batchCode},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="quantityProduced != null">quantity_produced = #{quantityProduced},</if>

ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityCheck"    column="quantity_check"    />
         <result property="quantityUnqualified"    column="quantity_unqualified"    />
         <result property="quantityQualified"    column="quantity_qualified"    />
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcIpqcVo">
-        select ipqc_id, ipqc_code, ipqc_name, ipqc_type, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, item_id, item_code, item_name, specification, unit_of_measure, quantity_check, quantity_unqualified, quantity_qualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_ipqc
+        select ipqc_id, ipqc_code, ipqc_name, ipqc_type, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_check, quantity_unqualified, quantity_qualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_ipqc
     </sql>
 
     <select id="selectQcIpqcList" parameterType="QcIpqc" resultMap="QcIpqcResult">
@@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+             <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityCheck != null "> and quantity_check = #{quantityCheck}</if>
             <if test="quantityUnqualified != null "> and quantity_unqualified = #{quantityUnqualified}</if>
             <if test="quantityQualified != null "> and quantity_qualified = #{quantityQualified}</if>
@@ -160,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityCheck != null">quantity_check,</if>
             <if test="quantityUnqualified != null">quantity_unqualified,</if>
             <if test="quantityQualified != null">quantity_qualified,</if>
@@ -209,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityCheck != null">#{quantityCheck},</if>
             <if test="quantityUnqualified != null">#{quantityUnqualified},</if>
             <if test="quantityQualified != null">#{quantityQualified},</if>
@@ -262,6 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityCheck != null">quantity_check = #{quantityCheck},</if>
             <if test="quantityUnqualified != null">quantity_unqualified = #{quantityUnqualified},</if>
             <if test="quantityQualified != null">quantity_qualified = #{quantityQualified},</if>

ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityMinCheck"    column="quantity_min_check"    />
         <result property="quantityMaxUnqualified"    column="quantity_max_unqualified"    />
         <result property="quantityRecived"    column="quantity_recived"    />
@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcIqcVo">
-        select iqc_id, iqc_code, iqc_name, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_qualified,quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
+        select iqc_id, iqc_code, iqc_name, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_qualified,quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
     </sql>
 
     <select id="selectQcIqcList" parameterType="QcIqc" resultMap="QcIqcResult">
@@ -76,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+             <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityMinCheck != null "> and quantity_min_check = #{quantityMinCheck}</if>
             <if test="quantityMaxUnqualified != null "> and quantity_max_unqualified = #{quantityMaxUnqualified}</if>
             <if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
@@ -128,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityMinCheck != null">quantity_min_check,</if>
             <if test="quantityMaxUnqualified != null">quantity_max_unqualified,</if>
             <if test="quantityRecived != null">quantity_recived,</if>
@@ -173,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityMinCheck != null">#{quantityMinCheck},</if>
             <if test="quantityMaxUnqualified != null">#{quantityMaxUnqualified},</if>
             <if test="quantityRecived != null">#{quantityRecived},</if>
@@ -243,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityMinCheck != null">quantity_min_check = #{quantityMinCheck},</if>
             <if test="quantityMaxUnqualified != null">quantity_max_unqualified = #{quantityMaxUnqualified},</if>
             <if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>

ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityCheck"    column="quantity_check"    />
         <result property="quantityUnqualified"    column="quantity_unqualified"    />
         <result property="crRate"    column="cr_rate"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcTemplateProductVo">
-        select record_id, template_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_template_product
+        select record_id, template_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_template_product
     </sql>
 
     <select id="selectQcTemplateProductList" parameterType="QcTemplateProduct" resultMap="QcTemplateProductResult">
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityCheck != null "> and quantity_check = #{quantityCheck}</if>
             <if test="quantityUnqualified != null "> and quantity_unqualified = #{quantityUnqualified}</if>
             <if test="crRate != null "> and cr_rate = #{crRate}</if>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityCheck != null">quantity_check,</if>
             <if test="quantityUnqualified != null">quantity_unqualified,</if>
             <if test="crRate != null">cr_rate,</if>
@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityCheck != null">#{quantityCheck},</if>
             <if test="quantityUnqualified != null">#{quantityUnqualified},</if>
             <if test="crRate != null">#{crRate},</if>
@@ -116,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityCheck != null">quantity_check = #{quantityCheck},</if>
             <if test="quantityUnqualified != null">quantity_unqualified = #{quantityUnqualified},</if>
             <if test="crRate != null">cr_rate = #{crRate},</if>

ktg-mes/src/main/resources/mapper/wm/WmArrivalNoticeLineMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityArrival"    column="quantity_arrival"    />
         <result property="quantityQuanlified"    column="quantity_quanlified"    />
         <result property="iqcCheck"    column="iqc_check"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmArrivalNoticeLineVo">
-        select line_id, notice_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_arrival, quantity_quanlified, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_arrival_notice_line
+        select line_id, notice_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_arrival, quantity_quanlified, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_arrival_notice_line
     </sql>
 
     <select id="selectWmArrivalNoticeLineList" parameterType="WmArrivalNoticeLine" resultMap="WmArrivalNoticeLineResult">
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityArrival != null "> and quantity_arrival = #{quantityArrival}</if>
             <if test="quantityQuanlified != null "> and quantity_quanlified = #{quantityQuanlified}</if>
             <if test="iqcCheck != null  and iqcCheck != ''"> and iqc_check = #{iqcCheck}</if>
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityArrival != null">quantity_arrival,</if>
             <if test="quantityQuanlified != null">quantity_quanlified,</if>
             <if test="iqcCheck != null">iqc_check,</if>
@@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityArrival != null">#{quantityArrival},</if>
             <if test="quantityQuanlified != null">#{quantityQuanlified},</if>
             <if test="iqcCheck != null">#{iqcCheck},</if>
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
             <if test="quantityArrival != null">quantity_arrival = #{quantityArrival},</if>
             <if test="quantityQuanlified != null">quantity_quanlified = #{quantityQuanlified},</if>
             <if test="iqcCheck != null">iqc_check = #{iqcCheck},</if>

ktg-mes/src/main/resources/mapper/wm/WmIssueLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityIssued"    column="quantity_issued"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmIssueLineVo">
-        select line_id, issue_id,material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_line
+        select line_id, issue_id,material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_line
     </sql>
 
     <select id="selectWmIssueLineList" parameterType="WmIssueLine" resultMap="WmIssueLineResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityIssued != null "> and quantity_issued = #{quantityIssued}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityIssued != null">quantity_issued,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityIssued != null">#{quantityIssued},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityIssued != null">quantity_issued = #{quantityIssued},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmItemRecptLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityRecived"    column="quantity_recived"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmItemRecptLineVo">
-        select line_id, recpt_id, notice_line_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date,iqc_check,iqc_id,iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_item_recpt_line
+        select line_id, recpt_id, notice_line_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date,iqc_check,iqc_id,iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_item_recpt_line
     </sql>
 
     <select id="selectWmItemRecptLineList" parameterType="WmItemRecptLine" resultMap="WmItemRecptLineResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityRecived != null">quantity_recived,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityRecived != null">#{quantityRecived},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -154,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml

@@ -144,6 +144,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         and 1=1 limit 1
     </select>
+    <select id="getByAreaId" resultType="com.ktg.mes.wm.domain.WmMaterialStock" resultMap="WmMaterialStockResult">
+        select * from wm_material_stock
+        where area_id = #{areaId}
+    </select>
+    <select id="getLocationId" resultType="com.ktg.mes.wm.domain.WmMaterialStock" resultMap="WmMaterialStockResult">
+        select * from wm_material_stock
+        where location_id = #{locationId}
+    </select>
+    <select id="getByWarehouseId" resultType="com.ktg.mes.wm.domain.WmMaterialStock" resultMap="WmMaterialStockResult">
+        select * from wm_material_stock
+        where warehouse_id = #{warehouseId}
+    </select>
 
     <insert id="insertWmMaterialStock" parameterType="WmMaterialStock" useGeneratedKeys="true" keyProperty="materialStockId">
         insert into wm_material_stock

ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityIssued"    column="quantity_issued"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmOutsourceIssueLineVo">
-        select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue_line
+        select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue_line
     </sql>
 
     <select id="selectWmOutsourceIssueLineList" parameterType="WmOutsourceIssueLine" resultMap="WmOutsourceIssueLineResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityIssued != null "> and quantity_issued = #{quantityIssued}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityIssued != null">quantity_issued,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityIssued != null">#{quantityIssued},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -145,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityIssued != null">quantity_issued = #{quantityIssued},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityRecived"    column="quantity_recived"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmOutsourceRecptLineVo">
-        select line_id, recpt_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line
+        select line_id, recpt_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line
     </sql>
 
     <select id="selectWmOutsourceRecptLineList" parameterType="WmOutsourceRecptLine" resultMap="WmOutsourceRecptLineResult">
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityRecived != null">quantity_recived,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityRecived != null">#{quantityRecived},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -156,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmPackageLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityPackage"    column="quantity_package"    />
         <result property="workorderId"    column="workorder_id"    />
         <result property="workorderCode"    column="workorder_code"    />
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmPackageLineVo">
-        select line_id, package_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_package, workorder_id, workorder_code, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package_line
+        select line_id, package_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_package, workorder_id, workorder_code, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package_line
     </sql>
 
     <select id="selectWmPackageLineList" parameterType="WmPackageLine" resultMap="WmPackageLineResult">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityPackage != null "> and quantity_package = #{quantityPackage}</if>
             <if test="workorderId != null "> and workorder_id = #{workorderId}</if>
             <if test="workorderCode != null  and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
@@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityPackage != null">quantity_package,</if>
             <if test="workorderId != null">workorder_id,</if>
             <if test="workorderCode != null">workorder_code,</if>
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityPackage != null">#{quantityPackage},</if>
             <if test="workorderId != null">#{workorderId},</if>
             <if test="workorderCode != null">#{workorderCode},</if>
@@ -154,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityPackage != null">quantity_package = #{quantityPackage},</if>
             <if test="workorderId != null">workorder_id = #{workorderId},</if>
             <if test="workorderCode != null">workorder_code = #{workorderCode},</if>

ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityRecived"    column="quantity_recived"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmProductRecptLineVo">
-        select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line
+        select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line
     </sql>
 
     <select id="selectWmProductRecptLineList" parameterType="WmProductRecptLine" resultMap="WmProductRecptLineResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''"> and unit_name = #{unitName}</if>
             <if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityRecived != null">quantity_recived,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -107,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityRecived != null">#{quantityRecived},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -140,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantitySalse"    column="quantity_salse"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmProductSalseLineVo">
-        select line_id, salse_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_salse, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, oqc_check,oqc_id,oqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse_line
+        select line_id, salse_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_salse, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, oqc_check,oqc_id,oqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse_line
     </sql>
 
     <select id="selectWmProductSalseLineList" parameterType="WmProductSalseLine" resultMap="WmProductSalseLineResult">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantitySalse != null "> and quantity_salse = #{quantitySalse}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantitySalse != null">quantity_salse,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -114,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantitySalse != null">#{quantitySalse},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -150,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantitySalse != null">quantity_salse = #{quantitySalse},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmRtIssueLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityRt"    column="quantity_rt"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmRtIssueLineVo">
-        select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rt, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_issue_line
+        select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rt, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_issue_line
     </sql>
 
     <select id="selectWmRtIssueLineList" parameterType="WmRtIssueLine" resultMap="WmRtIssueLineResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityRt != null "> and quantity_rt = #{quantityRt}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityRt != null">quantity_rt,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityRt != null">#{quantityRt},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityRt != null">quantity_rt = #{quantityRt},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmRtSalseLineMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityRted"    column="quantity_rted"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmRtSalseLineVo">
-        select line_id, rt_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse_line
+        select line_id, rt_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse_line
     </sql>
 
     <select id="selectWmRtSalseLineList" parameterType="WmRtSalseLine" resultMap="WmRtSalseLineResult">
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityRted != null "> and quantity_rted = #{quantityRted}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityRted != null">quantity_rted,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -106,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityRted != null">#{quantityRted},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -139,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
             <if test="quantityRted != null">quantity_rted = #{quantityRted},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmRtVendorLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityRted"    column="quantity_rted"    />
         <result property="batchCode"    column="batch_code"    />
         <result property="warehouseId"    column="warehouse_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmRtVendorLineVo">
-        select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_vendor_line
+        select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_vendor_line
     </sql>
 
     <select id="selectWmRtVendorLineList" parameterType="WmRtVendorLine" resultMap="WmRtVendorLineResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityRted != null "> and quantity_rted = #{quantityRted}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityRted != null">quantity_rted,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="warehouseId != null">warehouse_id,</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="quantityRted != null">#{quantityRted},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityRted != null">quantity_rted = #{quantityRted},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="batchCode"    column="batch_code"    />
         <result property="snNum"     column="snNum"></result>
         <result property="workorderId"     column="workorder_id"></result>
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="batchCode"    column="batch_code"    />
         <result property="snNum"     column="snNum"></result>
         <result property="workorderId"     column="workorder_id"></result>
@@ -56,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmSnVo">
-        select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
+        select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
     </sql>
 
     <select id="selectWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
             <if test="workorderId != null  and workorderId != ''"> and workorder_id = #{workorderId}</if>
         </where>
@@ -79,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSnList" parameterType="WmSn" resultMap="WmSnResult">
-        select item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
+        select item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code,gen_date , count(*) as snNum
         from wm_sn
         <where>
             <if test="snCode != null  and snCode != ''"> and sn_code = #{snCode}</if>
@@ -88,14 +91,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
         </where>
-        group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
+        group by item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code, gen_date
         order by item_id,batch_code desc
     </select>
 
     <select id="getStationList" parameterType="WmSn" resultMap="WmSnResult">
-        select sn.sn_id,sn.sn_code,sn.workorder_id,wo.workorder_code, sn.item_id,sn.item_code,sn.item_name,sn.specification,sn.unit_of_measure,ps.input_time
+        select sn.sn_id,sn.sn_code,sn.workorder_id,wo.workorder_code, sn.item_id,sn.item_code,sn.item_name,sn.specification,sn.unit_of_measure,sn.unit_name,ps.input_time
         from wm_sn sn
                  left join pro_sn_process ps
                            on sn.sn_id = ps.sn_id
@@ -106,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by ps.input_time desc
     </select>
     <select id="getWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
-        select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
+        select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code,gen_date , count(*) as snNum
         from wm_sn
         <where>
             <if test="snCode != null  and snCode != ''"> and sn_code = #{snCode}</if>
@@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
         </where>
         group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
@@ -131,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="batchCode != null">batch_code,</if>
             <if test="workorderId != null">workorder_id,</if>
             <if test="genDate !=null">gen_date,</if>
@@ -151,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="batchCode != null">#{batchCode},</if>
             <if test="workorderId != null">#{workorderId},</if>
             <if test="genDate !=null">#{genDate},</if>
@@ -175,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="batchCode != null">batch_code = #{batchCode},</if>
             <if test="workorderId != null">workorder_id = #{workorderId},</if>
             <if test="remark != null">remark = #{remark},</if>

ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml

@@ -60,6 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWmStorageAreaVo"/>
         where area_code = #{areaCode}
     </select>
+    <select id="selectByAreaIds" resultType="com.ktg.mes.wm.domain.WmStorageArea" resultMap="WmStorageAreaResult">
+        <include refid="selectWmStorageAreaVo"/>
+        where area_id in
+        <foreach collection="ids" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 
     <insert id="insertWmStorageArea" parameterType="WmStorageArea" useGeneratedKeys="true" keyProperty="areaId">
         insert into wm_storage_area
@@ -169,5 +176,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteByLocationId" parameterType="Long">
         delete from wm_storage_area where location_id = #{locationId}
     </delete>
+    <delete id="deleteByLocationIds" parameterType="Long">
+        delete from wm_storage_area
+        where location_id in
+        <foreach collection="ids" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
 
 </mapper>

ktg-mes/src/main/resources/mapper/wm/WmTransferLineMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemName"    column="item_name"    />
         <result property="specification"    column="specification"    />
         <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="unitName" column="unit_name" />
         <result property="quantityTransfer"    column="quantity_transfer"    />
         <result property="workorderId"    column="workorder_id"    />
         <result property="workorderCode"    column="workorder_code"    />
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmTransferLineVo">
-        select line_id, transfer_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_transfer, workorder_id, workorder_code, batch_code, from_warehouse_id, from_warehouse_code, from_warehouse_name, from_location_id, from_location_code, from_location_name, from_area_id, from_area_code, from_area_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, to_location_id, to_location_code, to_location_name, to_area_id, to_area_code, to_area_name, expire_date, vendor_id, vendor_code, vendor_name, vendor_nick, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer_line
+        select line_id, transfer_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_transfer, workorder_id, workorder_code, batch_code, from_warehouse_id, from_warehouse_code, from_warehouse_name, from_location_id, from_location_code, from_location_name, from_area_id, from_area_code, from_area_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, to_location_id, to_location_code, to_location_name, to_area_id, to_area_code, to_area_name, expire_date, vendor_id, vendor_code, vendor_name, vendor_nick, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer_line
     </sql>
 
     <select id="selectWmTransferLineList" parameterType="WmTransferLine" resultMap="WmTransferLineResult">
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
             <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
             <if test="quantityTransfer != null "> and quantity_transfer = #{quantityTransfer}</if>
             <if test="workorderId != null "> and workorder_id = #{workorderId}</if>
             <if test="workorderCode != null  and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
@@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name,</if>
             <if test="specification != null">specification,</if>
             <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="quantityTransfer != null">quantity_transfer,</if>
             <if test="workorderId != null">workorder_id,</if>
             <if test="workorderCode != null">workorder_code,</if>
@@ -156,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">#{itemName},</if>
             <if test="specification != null">#{specification},</if>
             <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">#{unitName}</if>
             <if test="quantityTransfer != null">#{quantityTransfer},</if>
             <if test="workorderId != null">#{workorderId},</if>
             <if test="workorderCode != null">#{workorderCode},</if>
@@ -205,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="specification != null">specification = #{specification},</if>
             <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="quantityTransfer != null">quantity_transfer = #{quantityTransfer},</if>
             <if test="workorderId != null">workorder_id = #{workorderId},</if>
             <if test="workorderCode != null">workorder_code = #{workorderCode},</if>

ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml

@@ -90,6 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWmWarehouseVo"/>
         where warehouse_name = #{warehouseName} limit 1
     </select>
+    <select id="selectByWarehouseId" resultType="com.ktg.mes.wm.domain.WmWarehouse" resultMap="WmWarehouseResult">
+        <include refid="selectWmWarehouseVo"/>
+        where warehouse_id in
+        <foreach collection="ids" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 
     <insert id="insertWmWarehouse" parameterType="WmWarehouse" useGeneratedKeys="true" keyProperty="warehouseId">
         insert into wm_warehouse

ktg-system/src/main/java/com/ktg/system/mapper/SysDeptMapper.java

@@ -121,4 +121,11 @@ public interface SysDeptMapper
      * @return
      */
     List<SysDept> selectAllDeptList();
+
+    /**
+     * 校验部门编码是否唯一
+     * @param deptCode
+     * @return
+     */
+    SysDept checkDeptCodeUnique(@Param("deptCode") String deptCode);
 }

ktg-system/src/main/java/com/ktg/system/service/ISysDeptService.java

@@ -119,4 +119,11 @@ public interface ISysDeptService
      * @return
      */
     List<SysDept> selectAllDeptList();
+
+    /**
+     * 校验部门编码是否唯一
+     * @param dept
+     * @return
+     */
+    String checkDeptCodeUnique(SysDept dept);
 }

ktg-system/src/main/java/com/ktg/system/service/impl/SysDeptServiceImpl.java

@@ -289,6 +289,17 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectAllDeptList();
     }
 
+    @Override
+    public String checkDeptCodeUnique(SysDept dept) {
+        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        SysDept info = deptMapper.checkDeptCodeUnique(dept.getDeptCode());
+        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     /**
      * 递归列表
      */

ktg-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -88,6 +88,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectAllDeptList" resultType="com.ktg.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
 	</select>
+	<select id="checkDeptCodeUnique" resultType="com.ktg.common.core.domain.entity.SysDept"  resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where dept_code = #{deptCode}
+		limit 1
+	</select>
 
 	<insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(