获取及更新客户订单调整

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductDetailDao.java

@@ -2,10 +2,7 @@ package com.rongwei.bscommon.sys.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rongwei.bsentity.domain.ApsCustomerManagementDo;
-import com.rongwei.bsentity.domain.ApsProductDetailDo;
-import com.rongwei.bsentity.domain.ApsProductionMergeOrderDo;
-import com.rongwei.bsentity.domain.ApsProductionOrderDo;
+import com.rongwei.bsentity.domain.*;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -41,4 +38,13 @@ public interface ApsProductDetailDao extends BaseMapper<ApsProductDetailDo> {
     @Select("select ID,CUSTOMERNAME,DELIVERYTIME from aps_customer_management where DELETED='0'")
     List<ApsCustomerManagementDo> getCustomerData();
 
+    @Select("select ID,MATERIALCODE,MATERIALNAME,MATERIALUNIT from aps_material where DELETED='0'")
+    List<ApsProcessMaterialDo> getMaterialData();
+
+    @Select("select VALUE as MATERIALCODE,NAME as MATERIALNAME from sys_dict where DELETED='0' and DICTTYPE='metal' and PID<>'-1'")
+    List<ApsProcessMaterialDo> getMetalData();
+
+    @Select("select VALUE as MATERIALCODE,NAME as MATERIALNAME from sys_dict where DELETED='0' and DICTTYPE='metalState' and PID<>'-1'")
+    List<ApsProcessMaterialDo> getMetalStateData();
+
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/SlaveOracleDao.java

@@ -18,7 +18,7 @@ public interface SlaveOracleDao {
      */
 
     @Select({" <script>",
-            "select * from V_NC_ORDER where ORDERNO in",
+            "select CSALEORDERID,VBILLCODE as ORDERNO,DBILLDATE as ORDERDATE,VNOTE as REMARK,NAME as BELONGFACTORY from V_BC_SO_SALEORDER where VBILLCODE in",
             " <foreach collection=\"orderNos\" item=\"orderno\" index=\"index\" open=\"(\" close=\")\" separator=\",\"> ",
             "  #{orderno}",
             "</foreach>",
@@ -31,7 +31,11 @@ public interface SlaveOracleDao {
      * @return
      */
     @Select({" <script>",
-            "select * from V_NC_ORDER_DETAIL where ORDERNO in",
+            "select b.CSALEORDERBID as ID,s.VBILLCODE as ORDERNO,b.CMATERIALVID as MATERIALCODE,b.MATERIALNAME,b.MATERIALSPEC as SPECIALFICATION,b.NNUM as TOTALORDERCOUNT,",
+            "   b.CUNITID as NUMBERUNIT,b.VROWNOTE as REMARK,b.PAIHAO as ALLOY,b.ZHUANGTAI as ALLOYSTATUS,b.HOUDU as THICKNESS,b.KUANDU as PROWIDTH,b.CHANGDU as PROLENGTH ",
+            "from V_BC_SO_SALEORDER_B b",
+            "left join V_BC_SO_SALEORDER s on b.CSALEORDERID=s.CSALEORDERID",
+            "where s.VBILLCODE in",
             " <foreach collection=\"orderNos\" item=\"orderno\" index=\"index\" open=\"(\" close=\")\" separator=\",\"> ",
             "  #{orderno}",
             "</foreach>",

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductDetailServiceImpl.java

@@ -58,13 +58,47 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
             return R.error("客户订单系统没有找到该订单");
         } else {
             VNcOrderVo vNcOrderVo = vNcOrderVos.get(0);
-            List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
-            ApsCustomerManagementDo apsCustomerManagementDo = customDatas.stream().filter(cus -> cus.getCustomername().equals(vNcOrderVo.getCustomname())).findAny().orElse(null);
-            if (apsCustomerManagementDo != null) {
-                vNcOrderVo.setCustomid(apsCustomerManagementDo.getId());
-                vNcOrderVo.setDeliverytime(apsCustomerManagementDo.getDeliverytime());
+//            List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
+//            ApsCustomerManagementDo apsCustomerManagementDo = customDatas.stream().filter(cus -> cus.getCustomername().equals(vNcOrderVo.getCustomname())).findAny().orElse(null);
+//            if (apsCustomerManagementDo != null) {
+//                vNcOrderVo.setCustomid(apsCustomerManagementDo.getId());
+//                vNcOrderVo.setDeliverytime(apsCustomerManagementDo.getDeliverytime());
+//            }
+            //明细 物料、合金、合金状态转换
+            List<ApsProcessMaterialDo> materialDos = apsProductDetailDao.getMaterialData();
+            List<ApsProcessMaterialDo> metalDos = apsProductDetailDao.getMetalData();
+            List<ApsProcessMaterialDo> metalStateDos = apsProductDetailDao.getMetalStateData();
+            List<VNcOrderDetailVo> vNcOrderDetailVoList = slaveSourceService.getVNcOrderDetailVo(orderNos);
+            for (VNcOrderDetailVo detailVo : vNcOrderDetailVoList) {
+                //物料
+                ApsProcessMaterialDo apsProcessMaterialDo = materialDos.stream().filter(apm -> apm.getMaterialname().equals(detailVo.getMaterialname())).findAny().orElse(null);
+                if (apsProcessMaterialDo != null) {
+                    detailVo.setMaterialcode(apsProcessMaterialDo.getMaterialcode());
+                    detailVo.setNumberunit(apsProcessMaterialDo.getMaterialunit());
+                } else {
+                    detailVo.setMaterialcode("");
+                    detailVo.setMaterialname("");
+                    detailVo.setNumberunit("");
+                }
+
+                //合金
+                ApsProcessMaterialDo metalDo = metalDos.stream().filter(apm -> apm.getMaterialname().equals(detailVo.getAlloy())).findAny().orElse(null);
+                if (metalDo != null) {
+                    detailVo.setAlloy(metalDo.getMaterialcode());
+                } else {
+                    detailVo.setAlloy("");
+                }
+
+                //合金状态
+                ApsProcessMaterialDo metalStateDo = metalStateDos.stream().filter(apm -> apm.getMaterialname().equals(detailVo.getAlloystatus())).findAny().orElse(null);
+                if (metalStateDo != null) {
+                    detailVo.setAlloystatus(metalStateDo.getMaterialcode());
+                } else {
+                    detailVo.setAlloystatus("");
+                }
             }
-            vNcOrderVo.setVNcOrderDetailVoList(slaveSourceService.getVNcOrderDetailVo(orderNos));
+
+            vNcOrderVo.setVNcOrderDetailVoList(vNcOrderDetailVoList);
             r.setCode("200");
             r.setData(vNcOrderVo);
             return r;
@@ -96,20 +130,24 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
         List<ApsProductionOrderDo> apsProductionOrderDoList = new ArrayList<>();
         List<ApsProductDetailDo> apsProductDetailDoList = new ArrayList<>();
         List<String> delProductDetailIdList = new ArrayList<>();
-        List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
+//        List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
+        //明细 物料、合金、合金状态转换
+        List<ApsProcessMaterialDo> materialDos = apsProductDetailDao.getMaterialData();
+        List<ApsProcessMaterialDo> metalDos = apsProductDetailDao.getMetalData();
+        List<ApsProcessMaterialDo> metalStateDos = apsProductDetailDao.getMetalStateData();
         for (ApsProductionOrderDo apsProductionOrderDo : apsProductionOrderDos) {
             //主表
             VNcOrderVo vNcOrderVo = vNcOrderVoList.stream().filter(nco -> nco.getOrderno().equals(apsProductionOrderDo.getCustomorderno())).findAny().orElse(null);
-            ApsCustomerManagementDo apsCustomerManagementDo = customDatas.stream().filter(cus -> cus.getCustomername().equals(vNcOrderVo.getCustomname())).findAny().orElse(null);
-            if (apsCustomerManagementDo != null) {
-                apsProductionOrderDo.setCustomid(apsCustomerManagementDo.getId());
-                apsProductionOrderDo.setCustomname(apsCustomerManagementDo.getCustomername());
-                apsProductionOrderDo.setDeliverytime(apsCustomerManagementDo.getDeliverytime());
-            } else {
-                apsProductionOrderDo.setCustomid("");
-                apsProductionOrderDo.setCustomname("");
-                apsProductionOrderDo.setDeliverytime(null);
-            }
+//            ApsCustomerManagementDo apsCustomerManagementDo = customDatas.stream().filter(cus -> cus.getCustomername().equals(vNcOrderVo.getCustomname())).findAny().orElse(null);
+//            if (apsCustomerManagementDo != null) {
+//                apsProductionOrderDo.setCustomid(apsCustomerManagementDo.getId());
+//                apsProductionOrderDo.setCustomname(apsCustomerManagementDo.getCustomername());
+//                apsProductionOrderDo.setDeliverytime(apsCustomerManagementDo.getDeliverytime());
+//            } else {
+//                apsProductionOrderDo.setCustomid("");
+//                apsProductionOrderDo.setCustomname("");
+//                apsProductionOrderDo.setDeliverytime(null);
+//            }
 
             apsProductionOrderDo.setOrderdate(vNcOrderVo.getOrderdate());
             apsProductionOrderDo.setRemark(vNcOrderVo.getRemark());
@@ -123,17 +161,39 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
                 VNcOrderDetailVo vNcOrderDetailVo = vNcOrderDetailVoList.stream().filter(vodl -> vodl.getId().equals(apsProductDetailDo.getCustomorderdetailid())).findAny().orElse(null);
                 if (vNcOrderDetailVo != null) {
                     //存在则更新
-                    apsProductDetailDo.setMaterialcode(vNcOrderDetailVo.getMaterialcode());
-                    apsProductDetailDo.setMaterialname(vNcOrderDetailVo.getMaterialname());
+                    //物料
+                    ApsProcessMaterialDo apsProcessMaterialDo = materialDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getMaterialname())).findAny().orElse(null);
+                    if (apsProcessMaterialDo != null) {
+                        apsProductDetailDo.setMaterialcode(apsProcessMaterialDo.getMaterialcode());
+                        apsProductDetailDo.setNumberunit(apsProcessMaterialDo.getMaterialunit());
+                    } else {
+                        apsProductDetailDo.setMaterialcode("");
+                        apsProductDetailDo.setMaterialname("");
+                        apsProductDetailDo.setNumberunit("");
+                    }
+
+                    //合金
+                    ApsProcessMaterialDo metalDo = metalDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloy())).findAny().orElse(null);
+                    if (metalDo != null) {
+                        apsProductDetailDo.setAlloy(metalDo.getMaterialcode());
+                    } else {
+                        apsProductDetailDo.setAlloy("");
+                    }
+
+                    //合金状态
+                    ApsProcessMaterialDo metalStateDo = metalStateDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloystatus())).findAny().orElse(null);
+                    if (metalStateDo != null) {
+                        apsProductDetailDo.setAlloystatus(metalStateDo.getMaterialcode());
+                    } else {
+                        apsProductDetailDo.setAlloystatus("");
+                    }
+
                     apsProductDetailDo.setSpecialfication(vNcOrderDetailVo.getSpecialfication());
-                    apsProductDetailDo.setAlloy(vNcOrderDetailVo.getAlloy());
-                    apsProductDetailDo.setAlloystatus(vNcOrderDetailVo.getAlloystatus());
                     apsProductDetailDo.setThickness(vNcOrderDetailVo.getThickness());
                     apsProductDetailDo.setProwidth(vNcOrderDetailVo.getProwidth());
                     apsProductDetailDo.setProlength(vNcOrderDetailVo.getProlength());
                     apsProductDetailDo.setTotalordercount(vNcOrderDetailVo.getTotalordercount());
                     apsProductDetailDo.setRollnum(vNcOrderDetailVo.getRollnum());
-                    apsProductDetailDo.setNumberunit(vNcOrderDetailVo.getNumberunit());
                     apsProductDetailDo.setRemark(vNcOrderDetailVo.getRemark());
 
                     apsProductDetailDoList.add(apsProductDetailDo);
@@ -155,6 +215,33 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
                 apsProductDetailDo.setTenantid(apsProductionOrderDo.getTenantid());
                 apsProductDetailDo.setCustomorderno(apsProductionOrderDo.getCustomorderno());
 
+                //物料
+                ApsProcessMaterialDo apsProcessMaterialDo = materialDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getMaterialname())).findAny().orElse(null);
+                if (apsProcessMaterialDo != null) {
+                    apsProductDetailDo.setMaterialcode(apsProcessMaterialDo.getMaterialcode());
+                    apsProductDetailDo.setNumberunit(apsProcessMaterialDo.getMaterialunit());
+                } else {
+                    apsProductDetailDo.setMaterialcode("");
+                    apsProductDetailDo.setMaterialname("");
+                    apsProductDetailDo.setNumberunit("");
+                }
+
+                //合金
+                ApsProcessMaterialDo metalDo = metalDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloy())).findAny().orElse(null);
+                if (metalDo != null) {
+                    apsProductDetailDo.setAlloy(metalDo.getMaterialcode());
+                } else {
+                    apsProductDetailDo.setAlloy("");
+                }
+
+                //合金状态
+                ApsProcessMaterialDo metalStateDo = metalStateDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloystatus())).findAny().orElse(null);
+                if (metalStateDo != null) {
+                    apsProductDetailDo.setAlloystatus(metalStateDo.getMaterialcode());
+                } else {
+                    apsProductDetailDo.setAlloystatus("");
+                }
+
                 apsProductDetailDoList.add(apsProductDetailDo);
             }
 
@@ -210,20 +297,24 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
         List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = new ArrayList<>();
         List<ApsProductDetailDo> apsProductDetailDoList = new ArrayList<>();
         List<String> delProductDetailIdList = new ArrayList<>();
-        List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
+//        List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
+        //明细 物料、合金、合金状态转换
+        List<ApsProcessMaterialDo> materialDos = apsProductDetailDao.getMaterialData();
+        List<ApsProcessMaterialDo> metalDos = apsProductDetailDao.getMetalData();
+        List<ApsProcessMaterialDo> metalStateDos = apsProductDetailDao.getMetalStateData();
         for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDos) {
             //主表
             VNcOrderVo vNcOrderVo = vNcOrderVoList.stream().filter(nco -> nco.getOrderno().equals(apsProductionMergeOrderDo.getCustomorderno())).findAny().orElse(null);
-            ApsCustomerManagementDo apsCustomerManagementDo = customDatas.stream().filter(cus -> cus.getCustomername().equals(vNcOrderVo.getCustomname())).findAny().orElse(null);
-            if (apsCustomerManagementDo != null) {
-                apsProductionMergeOrderDo.setCustomid(apsCustomerManagementDo.getId());
-                apsProductionMergeOrderDo.setCustomname(apsCustomerManagementDo.getCustomername());
-                apsProductionMergeOrderDo.setDeliverytime(apsCustomerManagementDo.getDeliverytime());
-            } else {
-                apsProductionMergeOrderDo.setCustomid("");
-                apsProductionMergeOrderDo.setCustomname("");
-                apsProductionMergeOrderDo.setDeliverytime(null);
-            }
+//            ApsCustomerManagementDo apsCustomerManagementDo = customDatas.stream().filter(cus -> cus.getCustomername().equals(vNcOrderVo.getCustomname())).findAny().orElse(null);
+//            if (apsCustomerManagementDo != null) {
+//                apsProductionMergeOrderDo.setCustomid(apsCustomerManagementDo.getId());
+//                apsProductionMergeOrderDo.setCustomname(apsCustomerManagementDo.getCustomername());
+//                apsProductionMergeOrderDo.setDeliverytime(apsCustomerManagementDo.getDeliverytime());
+//            } else {
+//                apsProductionMergeOrderDo.setCustomid("");
+//                apsProductionMergeOrderDo.setCustomname("");
+//                apsProductionMergeOrderDo.setDeliverytime(null);
+//            }
 
             apsProductionMergeOrderDo.setOrderdate(vNcOrderVo.getOrderdate());
             apsProductionMergeOrderDo.setRemark(vNcOrderVo.getRemark());
@@ -237,17 +328,39 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
                 VNcOrderDetailVo vNcOrderDetailVo = vNcOrderDetailVoList.stream().filter(vodl -> vodl.getId().equals(apsProductDetailDo.getCustomorderdetailid())).findAny().orElse(null);
                 if (vNcOrderDetailVo != null) {
                     //存在则更新
-                    apsProductDetailDo.setMaterialcode(vNcOrderDetailVo.getMaterialcode());
-                    apsProductDetailDo.setMaterialname(vNcOrderDetailVo.getMaterialname());
+                    //物料
+                    ApsProcessMaterialDo apsProcessMaterialDo = materialDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getMaterialname())).findAny().orElse(null);
+                    if (apsProcessMaterialDo != null) {
+                        apsProductDetailDo.setMaterialcode(apsProcessMaterialDo.getMaterialcode());
+                        apsProductDetailDo.setNumberunit(apsProcessMaterialDo.getMaterialunit());
+                    } else {
+                        apsProductDetailDo.setMaterialcode("");
+                        apsProductDetailDo.setMaterialname("");
+                        apsProductDetailDo.setNumberunit("");
+                    }
+
+                    //合金
+                    ApsProcessMaterialDo metalDo = metalDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloy())).findAny().orElse(null);
+                    if (metalDo != null) {
+                        apsProductDetailDo.setAlloy(metalDo.getMaterialcode());
+                    } else {
+                        apsProductDetailDo.setAlloy("");
+                    }
+
+                    //合金状态
+                    ApsProcessMaterialDo metalStateDo = metalStateDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloystatus())).findAny().orElse(null);
+                    if (metalStateDo != null) {
+                        apsProductDetailDo.setAlloystatus(metalStateDo.getMaterialcode());
+                    } else {
+                        apsProductDetailDo.setAlloystatus("");
+                    }
+
                     apsProductDetailDo.setSpecialfication(vNcOrderDetailVo.getSpecialfication());
-                    apsProductDetailDo.setAlloy(vNcOrderDetailVo.getAlloy());
-                    apsProductDetailDo.setAlloystatus(vNcOrderDetailVo.getAlloystatus());
                     apsProductDetailDo.setThickness(vNcOrderDetailVo.getThickness());
                     apsProductDetailDo.setProwidth(vNcOrderDetailVo.getProwidth());
                     apsProductDetailDo.setProlength(vNcOrderDetailVo.getProlength());
                     apsProductDetailDo.setTotalordercount(vNcOrderDetailVo.getTotalordercount());
                     apsProductDetailDo.setRollnum(vNcOrderDetailVo.getRollnum());
-                    apsProductDetailDo.setNumberunit(vNcOrderDetailVo.getNumberunit());
                     apsProductDetailDo.setRemark(vNcOrderDetailVo.getRemark());
 
                     apsProductDetailDoList.add(apsProductDetailDo);
@@ -269,6 +382,33 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
                 apsProductDetailDo.setTenantid(apsProductionMergeOrderDo.getTenantid());
                 apsProductDetailDo.setCustomorderno(apsProductionMergeOrderDo.getCustomorderno());
 
+                //物料
+                ApsProcessMaterialDo apsProcessMaterialDo = materialDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getMaterialname())).findAny().orElse(null);
+                if (apsProcessMaterialDo != null) {
+                    apsProductDetailDo.setMaterialcode(apsProcessMaterialDo.getMaterialcode());
+                    apsProductDetailDo.setNumberunit(apsProcessMaterialDo.getMaterialunit());
+                } else {
+                    apsProductDetailDo.setMaterialcode("");
+                    apsProductDetailDo.setMaterialname("");
+                    apsProductDetailDo.setNumberunit("");
+                }
+
+                //合金
+                ApsProcessMaterialDo metalDo = metalDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloy())).findAny().orElse(null);
+                if (metalDo != null) {
+                    apsProductDetailDo.setAlloy(metalDo.getMaterialcode());
+                } else {
+                    apsProductDetailDo.setAlloy("");
+                }
+
+                //合金状态
+                ApsProcessMaterialDo metalStateDo = metalStateDos.stream().filter(apm -> apm.getMaterialname().equals(vNcOrderDetailVo.getAlloystatus())).findAny().orElse(null);
+                if (metalStateDo != null) {
+                    apsProductDetailDo.setAlloystatus(metalStateDo.getMaterialcode());
+                } else {
+                    apsProductDetailDo.setAlloystatus("");
+                }
+
                 apsProductDetailDoList.add(apsProductDetailDo);
             }
 

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessMaterialDo.java

@@ -0,0 +1,47 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物料信息
+ * </p>
+ *
+ * @author dlc
+ * @since 2024-04-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("aps_material")
+public class ApsProcessMaterialDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+    /**
+     * 物料编号
+     */
+    @TableField("MATERIALCODE")
+    private String materialcode;
+    /**
+     * 物料名称
+     */
+    @TableField("MATERIALNAME")
+    private String materialname;
+    /**
+     * 物料单位
+     */
+    @TableField("MATERIALUNIT")
+    private String materialunit;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/VNcOrderVo.java

@@ -7,6 +7,10 @@ import java.util.List;
 
 @Data
 public class VNcOrderVo {
+    /**
+     * NC单据号ID
+     */
+    private String csaleorderid;
     /**
      * 客户订单号
      */