发货任务子表 新增字段物料类型

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailBaseVO.java

@@ -8,6 +8,8 @@ import java.time.LocalDateTime;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -115,4 +117,6 @@ public class DeliverJobDetailBaseVO {
     private String onTheWayLocationCode;
     @Schema(description = "业务类型")
     private String businessType;
+    @Schema(description = "物料类型")
+    private String itemType;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExcelVO.java

@@ -83,6 +83,8 @@ public class DeliverJobDetailExcelVO {
 
     @ExcelProperty("更新者名称")
     private String updater;
-    @Schema(description = "业务类型")
+    @ExcelProperty("业务类型")
     private String businessType;
+    @ExcelProperty("物料类型")
+    private String itemType;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java

@@ -81,4 +81,6 @@ public class DeliverJobDetailExportReqVO {
     private String onTheWayLocationCode;
     @Schema(description = "业务类型")
     private String businessType;
+    @Schema(description = "物料类型")
+    private String itemType;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailPageReqVO.java

@@ -94,4 +94,7 @@ public class DeliverJobDetailPageReqVO extends PageParam {
 
     @Schema(description = "发货类型")
     private String deliverType;
+
+    @Schema(description = "物料类型")
+    private String itemType;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailRespVO.java

@@ -251,4 +251,8 @@ public class DeliverJobDetailRespVO extends DeliverJobDetailBaseVO {
      * 发货类型
      */
     private String deliverType;
+    /**
+     * 物料类型
+     */
+    private String itemType;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobDetailDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.deliverJob;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.sun.xml.bind.v2.TODO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -120,4 +121,8 @@ public class DeliverJobDetailDO extends BaseDO {
      * 业务类型
      */
     private String businessType;
+    /**
+     * 物料类型
+     */
+    private String itemType;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverJob/DeliverJobDetailMapper.java

@@ -49,6 +49,7 @@ public interface DeliverJobDetailMapper extends BaseMapperX<DeliverJobDetailDO>
                 .likeIfPresent(DeliverJobDetailDO::getUom, reqVO.getUom())
                 .likeIfPresent(DeliverJobDetailDO::getNumber, reqVO.getNumber())
                 .likeIfPresent(DeliverJobDetailDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(DeliverJobDetailDO::getItemType, reqVO.getItemType())
                 .betweenIfPresent(DeliverJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(DeliverJobDetailDO::getCreator, reqVO.getCreator());
         boolean queryMainFlag = false;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java

@@ -58,14 +58,17 @@ public class CustomerServiceImpl implements CustomerService {
         validateCustomerExists(updateReqVO.getId());
         // 校验存在
         validateCurrencyexchangeForUpdate(updateReqVO.getName(),updateReqVO.getAvailable());
-        CustomerDO customerDO = customerMapper.selectOne("name", updateReqVO.getName(), "id", updateReqVO.getId());
-        if(customerDO != null && updateReqVO.getId() == customerDO.getId()){
+        QueryWrapper<CustomerDO> customerDOQueryWrapper = new QueryWrapper<>();
+        customerDOQueryWrapper.eq("name", updateReqVO.getName());
+        customerDOQueryWrapper.ne("id", updateReqVO.getId());
+        Long count = customerMapper.selectCount(customerDOQueryWrapper);
+        if(count >0){
             throw exception(CUSTOMER_NAME_REPEAT);
         }
         // 更新
         CustomerDO updateObj = CustomerConvert.INSTANCE.convert(updateReqVO);
         customerMapper.updateById(updateObj);
-        trendsApi.createTrends(updateObj.getId(), "basic_customer", JSONUtil.toJsonStr(customerDO) , "修改了客户",JSONUtil.toJsonStr(updateObj), TrendsTypeEnum.UPDATE,String.valueOf(getLoginUserId()));
+        trendsApi.createTrends(updateObj.getId(), "basic_customer", JSONUtil.toJsonStr(updateReqVO) , "修改了客户",JSONUtil.toJsonStr(updateObj), TrendsTypeEnum.UPDATE,String.valueOf(getLoginUserId()));
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java

@@ -751,6 +751,10 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
                 deliverJobDetailDo.setItemName(detailDO.getItemName());
                 deliverJobDetailDo.setItemDesc1(detailDO.getItemDesc1());
                 deliverJobDetailDo.setItemDesc2(detailDO.getItemDesc2());
+                ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDO.getItemCode());
+                if(itembasicDO != null){
+                    deliverJobDetailDo.setItemType(itembasicDO.getType());
+                }
                 deliverJobDetailDo.setProjectCode(detailDO.getProjectCode());
                 deliverJobDetailDo.setQty(balanceDOItem.getQty());
                 deliverJobDetailDo.setBusinessType(deliverJobMainDO.getBusinessType());