Merge branch 'dev-zzs' into test

src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java

@@ -53,7 +53,8 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
                 .on("salesorderid", "main_id_g_claimed_amt_fk")
                 .select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(claimedAmt))
                 .finish();
-        claimDate = claimDate.select("main_id_gathering_fk, yem_prodpaydate yem_firstpaydate, yem_endpaydate yem_lastpaydate");
+        claimDate = claimDate.select("main_id_gathering_fk, yem_endpaydate yem_lastpaydate, " +
+                "CASE WHEN yem_prodpaydate != '' THEN yem_prodpaydate ELSE yem_shippaydate END yem_firstpaydate");
         resDataSet = resDataSet.leftJoin(claimDate)
                 .on("salesorderid", "main_id_gathering_fk")
                 .select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(claimDate))

src/main/java/com/yem/wm/es/storagetrans/dynamic/BackFillbillEdit.java

@@ -45,6 +45,7 @@ public class BackFillbillEdit extends AbstractFormPlugin {
 
         model.setValue("yem_encasemedate", parentModel.getValue("yem_encasemedate"));//预计装箱时间
         model.setValue("yem_cfscompnay", parentModel.getValue("yem_cfscompnay"));//货代公司
+        model.setValue("yem_cfscompnaytxt", parentModel.getValue("yem_cfscompnaytxt"));//货代公司
         model.setValue("yem_custombrokers", parentModel.getValue("yem_custombrokers"));//报关行
         model.setValue("yem_bhd_combo", parentModel.getValue("yem_bhd_combo"));//运费承付
         model.setValue("yem_boxtext", parentModel.getValue("yem_boxvolume1"));//箱型箱量
@@ -173,6 +174,7 @@ public class BackFillbillEdit extends AbstractFormPlugin {
         Map map = new HashMap();
         map.put("yem_encasemedate", model.getValue("yem_encasemedate"));//预计装箱时间
         map.put("yem_cfscompnay", model.getValue("yem_cfscompnay"));//货代公司
+        map.put("yem_cfscompnaytxt", model.getValue("yem_cfscompnaytxt"));//货代公司
         map.put("yem_custombrokers", model.getValue("yem_custombrokers"));//报关行
         map.put("yem_bhd_combo", model.getValue("yem_bhd_combo"));//运费承付
         map.put("yem_boxtext", model.getValue("yem_boxtext"));//箱型箱量

src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java

@@ -108,7 +108,8 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
             String yemVoyageno = (String) this.getModel().getValue("yem_voyageno");//航次
             Date yemCutdate = (Date) this.getModel().getValue("yem_cutdate");//截单日期
             Date yemPortinterception = (Date) this.getModel().getValue("yem_portinterception");//截港日期
-            DynamicObject yemCfscompnay = (DynamicObject) this.getModel().getValue("yem_cfscompnay");//货代公司
+//            DynamicObject yemCfscompnay = (DynamicObject) this.getModel().getValue("yem_cfscompnay");//货代公司
+            String yemCfscompnay = (String) this.getModel().getValue("yem_cfscompnaytxt");//货代公司
             Date yemEtddate = (Date) this.getModel().getValue("yem_etddate");//ETD(离港日期）
             DynamicObject yemSctcompnayname = (DynamicObject) this.getModel().getValue("yem_sctcompnayname");//船公司
             String yemStation = (String) this.getModel().getValue("yem_stationtext");//场站
@@ -153,7 +154,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                         boonle = false;
                         i++;
                     }
-                    if (null == yemCfscompnay) {
+                    if (YEM.isEmpty(yemCfscompnay)) {
                         string = string + i + ". 货代公司为空，请稍后重试！\n";
                         boonle = false;
                         i++;
@@ -190,14 +191,14 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                         boonle = false;
                         i++;
                     }
-                    if (null == yemCfscompnay) {
+                    if (YEM.isEmpty(yemCfscompnay)) {
                         string = string + i + ". 货代公司为空，请稍后重试！\n";
                         boonle = false;
                         i++;
                     }
                 }
                 if ("YSFS-1001".equals(number) || "YSFS-1002".equals(number)) {
-                    if (null == yemCfscompnay) {
+                    if (YEM.isEmpty(yemCfscompnay)) {
                         string = string + i + ". 货代公司为空，请稍后重试！\n";
                         boonle = false;
                         i++;
@@ -251,7 +252,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                         boonle = false;
                         i++;
                     }
-                    if (null == yemCfscompnay) {
+                    if (YEM.isEmpty(yemCfscompnay)) {
                         string = string + i + ". 货代公司为空，请稍后重试！\n";
                         boonle = false;
                         i++;
@@ -298,7 +299,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
 //                        boonle = false;
 //                        i++;
 //                    }
-                    if (null == yemCfscompnay) {
+                    if (YEM.isEmpty(yemCfscompnay)) {
                         string = string + i + ". 货代公司为空，请稍后重试！\n";
                         boonle = false;
                         i++;
@@ -349,6 +350,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
                 DynamicObject yem_customer = dataEntity.getDynamicObject("yem_customer");
                 model.setValue("yem_encasemedate", map.get("yem_encasemedate"));//预计装箱时间
                 model.setValue("yem_cfscompnay", map.get("yem_cfscompnay"));//货代公司
+                model.setValue("yem_cfscompnaytxt", map.get("yem_cfscompnaytxt"));//货代公司
                 model.setValue("yem_custombrokers", map.get("yem_custombrokers"));//报关行
                 model.setValue("yem_bhd_combo", map.get("yem_bhd_combo"));//运费承付
 //                model.setValue("yem_boxtext", map.get("yem_boxtext"));//箱型箱量
@@ -458,6 +460,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
             if (storagetrans != null) {
                 storagetrans.set("yem_encasemedate", map.get("yem_encasemedate"));//预计装箱时间
                 storagetrans.set("yem_cfscompnay", map.get("yem_cfscompnay"));//货代公司
+                storagetrans.set("yem_cfscompnaytxt", map.get("yem_cfscompnaytxt"));//货代公司
                 storagetrans.set("yem_custombrokers", map.get("yem_custombrokers"));//报关行
                 storagetrans.set("yem_bhd_combo", map.get("yem_bhd_combo"));//运费承付
                 storagetrans.set("yem_boxtexts", map.get("yem_boxtext"));//箱型箱量