来料加工

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

@@ -126,5 +126,7 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
 
     @Schema(description = "税率")
     private BigDecimal taxRte;
+    @Schema(description = "价格条件明细")
+    private String priceConditionDetail;
 
 }

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

@@ -156,5 +156,10 @@ public class OriginalMaterialProcessingDetailRespVO {
     private String metalAcctasscatGroup;
 
     @Schema(description = "税率")
+    @ExcelProperty("税率")
     private BigDecimal taxRte;
+
+    @Schema(description = "价格条件明细")
+    @ExcelProperty("价格条件明细")
+    private String priceConditionDetail;
 }

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

@@ -124,4 +124,6 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
 
     @Schema(description = "税率")
     private BigDecimal taxRte;
+    @Schema(description = "价格条件明细")
+    private String priceConditionDetail;
 }

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

@@ -19,9 +19,10 @@ public class OriginalMaterialProcessingPageReqVO extends PageParam {
     @Schema(description = "订单号")
     private String systemOrderNumber;
 
-    @Schema(description = "公司编码;推送ERP（必须）")
+    @Schema(description = "公司名称", example = "芋艿")
     private String cpName;
-
+    @Schema(description = "公司编码;推送ERP（必须）")
+    private String cpNum;
     @Schema(description = "客商编码;推送ERP（必须）")
     private String supplierNumber;
 

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

@@ -170,6 +170,8 @@ public class OriginalMaterialProcessingSaveReqVO {
     private String saleOrgzCd;
     @Schema(description = "付款方名称")
     private String payerName;
+    @Schema(description = "付款方编码")
+    private String payerNum;
     @Schema(description = "销售组织名称")
     private String saleOrgzName;
     @Schema(description = "分销聚道编码")

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

@@ -213,4 +213,7 @@ public class OriginalMaterialProcessingDetailDO extends BusinessBaseDO {
      */
     @TableField("TAX_RTE")
     private BigDecimal taxRte;
+
+    @TableField("PRC_CND_DTL")
+    private String priceConditionDetail;
 }

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

@@ -1,6 +1,8 @@
 package com.zt.plat.module.contractorder.service.originalmaterialprocessing;
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONException;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -127,7 +129,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
     }
 
     private String generateOrderNumber(String materialType) {
-        return sequenceApi.getNextSequence("ENTRUST_ORDER_NUMBER", null, null).getData();
+        return sequenceApi.getNextSequence("OEM_CMT_ORDER_NO", null, null).getData();
     }
 
 
@@ -455,6 +457,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
         // head.setTaxclass(1);
         erpSalesOrderSaveReqVO.setHead(head);
         List<ErpSalesOrderSaveReqVO.Item> items = new ArrayList<>();
+        List<String> conds = new ArrayList<>();
         originalMaterialProcessingDetailDOS.forEach(detail -> {
             ErpSalesOrderSaveReqVO.Item item = new ErpSalesOrderSaveReqVO.Item();
             item.setItem_categ(String.valueOf(detail.getLineNumber()));
@@ -469,7 +472,23 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
             item.setShip_point(detail.getShippingPlace()); // 装运地点
             item.setAcct_assgt(detail.getMetalAcctasscatGroup());//todo 物料科目分配组
             items.add(item);
+
+            //conds
+            String priceConditionDetail = detail.getPriceConditionDetail();
+            if (priceConditionDetail == null || priceConditionDetail.trim().isEmpty()) {
+                return; // 空字符串直接跳过
+            }
+            try {
+                // 解析 JSON 数组，捕获格式错误
+                List<String> strList = JSONArray.parseArray(priceConditionDetail, String.class);
+                // List<JSONArray> jsonArrays = JSONArray.parseArray(priceConditionDetail, JSONArray.class);
+                conds.addAll(strList);
+            } catch (JSONException e) {
+                // 处理解析失败（例如打日志、忽略错误数据等）
+                log.error("解析价格条件详情失败，内容：{}", priceConditionDetail, e);
+            }
         });
+        erpSalesOrderSaveReqVO.setConds(conds);
     }
 
     @Override
@@ -483,7 +502,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
             throw exception(ORIGINAL_MATERIAL_PROCESSING_DO_NOT_EXISTS);
         }
 
-        if (originalMaterialProcessingDO.getOrderSAPNumber()!=null) {
+        if (originalMaterialProcessingDO.getOrderSAPNumber() != null) {
             throw exception(ORDER_ALREADY_SUBMIT);
         }