销售订单同步 添加 计划到货时间字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -222,4 +222,8 @@ public class SyOrderDataItem {
 	@Excel(name = "套装件数", width = 15)
 	@ApiModelProperty(value = "套装件数")
 	private java.math.BigDecimal numberOfSets;
+
+	@Excel(name = "计划到货时间", width = 15)
+	@ApiModelProperty(value = "计划到货时间")
+	private String dArriveDate;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataVO.java

@@ -37,6 +37,7 @@ public class SyOrderDataVO {
     private java.lang.String ompoAccount;
     //门幅
     private String guangpeiGateWidth;
-    //克重
+    //采购委外计划到货时间
+    private String dArriveDate;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -192,6 +192,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                         sy2.setOmpoAccount(ordervo.getOmpoAccount());
                         sy2.setOmpoCode(ordervo.getOmpoCode());
                         sy2.setOmpoId(ordervo.getOmpoId());
+                        sy2.setDArriveDate(ordervo.getDArriveDate());
                         sy2.setOmpoIdItem(ordervo.getOmpoIdItem());
                         sy2.setITaxPrice(ordervo.getITaxPrice());
                         if(sy2.getGuangpeiGateWidth()==null||sy2.getGuangpeiGateWidth().equals("/")||sy2.getGuangpeiGateWidth().equals("")){
@@ -400,12 +401,12 @@ public class AddOrderJob implements Job,ApplicationContextAware {
          */
         if(account[0].equals(syOrderDataVO.getAccount())){
             String sql = "  SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[0]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,dArriveDate,guangpeiGateWidth," +account[0]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem," +
-                    " od.cDefine23  as guangpeiGateWidth,"+
+                    " od.cDefine23  as guangpeiGateWidth,od.dArriveDate,"+
                     " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid" +
                     " FROM OM_MOMain om" +
                     " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +
@@ -422,12 +423,12 @@ public class AddOrderJob implements Job,ApplicationContextAware {
 
         }else if(account[1].equals(syOrderDataVO.getAccount())){
             String sql = "SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth,s.iRowNo as poIrowno," +account[1]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth,dArriveDate,s.iRowNo as poIrowno," +account[1]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem,pd.irowno as poIrowno,"+
-                    " pd.cDefine23  as guangpeiGateWidth,"+
+                    " pd.cDefine23  as guangpeiGateWidth,pd.dArriveDate,"+
                     " pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid" +
                     " FROM PO_Pomain pm" +
                     " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
@@ -447,13 +448,13 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                 return syOrderDataVO;
             }
             String sql2 = "SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[2]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,dArriveDate,guangpeiGateWidth," +account[2]+" as ompoAccount"+
                     " FROM" +
                     "  so_somain ss " +
                     "  join SO_SODetails s on s.id=ss.id" +
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem," +
-                    " pd.cDefine23  as guangpeiGateWidth,"+
+                    " pd.cDefine23  as guangpeiGateWidth,pd.dArriveDate,"+
                     " pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid" +
                     " FROM PO_Pomain pm" +
                     " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
@@ -461,7 +462,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                     " UNION" +
                     " SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem," +
                     " od.cDefine23  as guangpeiGateWidth,"+
-                    " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid" +
+                    " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid,od.dArriveDate" +
                     " FROM OM_MOMain om" +
                     " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +
                     " where om.cState = 1" +
@@ -477,19 +478,19 @@ public class AddOrderJob implements Job,ApplicationContextAware {
 
         }else if(account[2].equals(syOrderDataVO.getAccount())){
             String sql = "SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[2]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,dArriveDate,guangpeiGateWidth," +account[2]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem," +
-                    " pd.cDefine23  as guangpeiGateWidth,"+
+                    " pd.cDefine23  as guangpeiGateWidth,pd.dArriveDate,"+
                     " pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid" +
                     " FROM PO_Pomain pm" +
                     " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
                     " where pm.cState = 1" +
                     " UNION" +
                     " SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem," +
-                    " od.cDefine23  as guangpeiGateWidth,"+
+                    " od.cDefine23  as guangpeiGateWidth,od.dArriveDate,"+
                     " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid" +
                     " FROM OM_MOMain om" +
                     " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +