委托加工添加发货工厂字段和明细添加金属元素字段

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java

@@ -154,4 +154,12 @@ public class OriginalMaterialProcessingController {
         originalMaterialProcessingService.closeOrder(ids);
         return success(true);
     }
+    //来料采购提交erp061
+    @PostMapping("/submit-to-erp061")
+    @Operation(summary = "来料采购提交erp061")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update')")
+    public CommonResult<Boolean> submitToErp061(@RequestParam("id") Long id) {
+        originalMaterialProcessingService.submitToErp061(id);
+        return success(true);
+    }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingPageReqVO.java

@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Set;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 @Schema(description = "原始物料处理分页查询ReqVO")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 @Schema(description = "原始物料处理响应VO")
 @Data

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingSaveReqVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 @Schema(description = "原始物料处理保存ReqVO")
 @Data

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDO.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.contractorder.dal.dataobject.originalmaterialprocessing;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Set;
 
 /**
 * 来料订单 DO
@@ -264,6 +266,6 @@ public class OriginalMaterialProcessingDO extends BusinessBaseDO {
     /**
      * 关联订单ID
      */
-    @TableField("REL_ORD_ID")
+    @TableField(value = "REL_ORD_ID")
     private Long relatedOrderId;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/originalmaterialprocessing/OriginalMaterialProcessingMapper.java

@@ -47,7 +47,8 @@ public interface OriginalMaterialProcessingMapper extends BaseMapperX<OriginalMa
                 .eqIfPresent(OriginalMaterialProcessingDO::getCause, reqVO.getCause())
                 .eqIfPresent(OriginalMaterialProcessingDO::getStatus, reqVO.getStatus())
                 .likeIfPresent(OriginalMaterialProcessingDO::getPurchaseGroupName, reqVO.getPurchaseGroupName())
-                .eqIfPresent(OriginalMaterialProcessingDO::getRelatedOrderId, reqVO.getRelatedOrderId())
+                //.eqIfPresent(OriginalMaterialProcessingDO::getRelatedOrderId, reqVO.getRelatedOrderId())
+                .eqIfPresent(OriginalMaterialProcessingDO::getSplyBsnTp, reqVO.getSplyBsnTp())
                 .orderByDesc(OriginalMaterialProcessingDO::getId));
     }
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingService.java

@@ -103,4 +103,6 @@ public interface OriginalMaterialProcessingService {
      * @return 来料订单详情列表
      */
     List<OriginalMaterialProcessingDetailRespVO> getOriginalMaterialProcessingDetailListByOrderId(Long id);
+
+    void submitToErp061(Long id);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java

@@ -3,6 +3,9 @@ package com.zt.plat.module.contractorder.service.originalmaterialprocessing;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO;
@@ -29,8 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_ORDER_EXISTS;
@@ -166,6 +168,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
 
     @Override
     public OriginalMaterialProcessingDO getOriginalMaterialProcessing(Long id) {
+
         return originalMaterialProcessingMapper.selectById(id);
     }
 
@@ -265,4 +268,9 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
         return originalMaterialProcessingDetailService.getOriginalMaterialProcessingDetailListByOrderId(id);
     }
 
+    @Override
+    public void submitToErp061(Long id) {
+
+    }
+
 }