Merge remote-tracking branch 'origin/master'

bamp/basedata/webapi/CustomerAddnewWebApiPlugin.java

@@ -98,6 +98,9 @@ public class CustomerAddnewWebApiPlugin implements Serializable {
                     setDateField(true,"modifytime","disabledate",param,resultData,customerObj);
                     //使用状态
                     customerObj.set("enable","0");
+                }else{
+                    //使用状态
+                    customerObj.set("enable","1");
                 }
                 //客户字码分录
                 if(param.get("pznm_zmentry")!=null){
@@ -361,7 +364,7 @@ public class CustomerAddnewWebApiPlugin implements Serializable {
         DynamicObject[] isHaveObjs = BusinessDataServiceHelper.load("pznm_customerzm",
                 "id,pznm_zmet_org,pznm_zmet_org.number,pznm_zmet_number,pznm_zmet_name,pznm_zmet_oldnumber,pznm_zmet_wtr,pznm_zmet_wtrphone," +
                         "pznm_zmet_lxr,pznm_zmet_lxrphone,pznm_shipaddress,pznm_shipperson,pznm_shipphone,pznm_zmet_setttype," +
-                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype",
+                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype,pznm_sourcesysid",
                 new QFilter[]{qFilter_customer,qFilter_org,qFilter_ztnumber});
         for(DynamicObject obj : isHaveObjs){
             DynamicObject org =  (DynamicObject) obj.getDynamicObject("pznm_zmet_org");
@@ -380,6 +383,8 @@ public class CustomerAddnewWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,update_entry);
+                //客户子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,update_entry);
                 //客户子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,update_entry);
                 //客户子码.子码名称
@@ -428,6 +433,8 @@ public class CustomerAddnewWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,add_entry);
+                //客户子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,add_entry);
                 //客户子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,add_entry);
                 //客户子码.子码名称
@@ -633,7 +640,7 @@ public class CustomerAddnewWebApiPlugin implements Serializable {
             String appId = appInfo.getAppId();
             Set<Long> dataIds = new HashSet<Long>();
             dataIds.add(customerObj.getLong("id"));
-            QFilter qFilter_number = new QFilter("number", QCP.equals,"1");
+            QFilter qFilter_number = new QFilter("number", QCP.equals,"10000");
             DynamicObject useOrg = BusinessDataServiceHelper.loadSingle("bos_adminorg","id",new QFilter[]{qFilter_number});
             long useOrgId = useOrg.getLong("id");
             BaseDataResponse response = (new AssignService("bd_customer").assign(useOrgId, appId, dataIds, orgIds, true));

bamp/basedata/webapi/CustomerSaveWebApiPlugin.java

@@ -355,7 +355,7 @@ public class CustomerSaveWebApiPlugin implements Serializable {
         DynamicObject[] isHaveObjs = BusinessDataServiceHelper.load("pznm_customerzm",
                 "id,pznm_zmet_org,pznm_zmet_org.number,pznm_zmet_number,pznm_zmet_name,pznm_zmet_oldnumber,pznm_zmet_wtr,pznm_zmet_wtrphone," +
                         "pznm_zmet_lxr,pznm_zmet_lxrphone,pznm_shipaddress,pznm_shipperson,pznm_shipphone,pznm_zmet_setttype," +
-                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype",
+                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype,pznm_sourcesysid",
                 new QFilter[]{qFilter_customer,qFilter_org,qFilter_ztnumber});
         for(DynamicObject obj : isHaveObjs){
             DynamicObject org =  (DynamicObject) obj.getDynamicObject("pznm_zmet_org");
@@ -374,6 +374,8 @@ public class CustomerSaveWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,update_entry);
+                //客户子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,update_entry);
                 //客户子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,update_entry);
                 //客户子码.子码名称
@@ -422,6 +424,8 @@ public class CustomerSaveWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,add_entry);
+                //客户子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,add_entry);
                 //客户子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,add_entry);
                 //客户子码.子码名称

bamp/basedata/webapi/SupplierAddnewWebApiPlugin.java

@@ -329,7 +329,7 @@ public class SupplierAddnewWebApiPlugin implements Serializable {
         DynamicObject[] isHaveObjs = BusinessDataServiceHelper.load("pznm_supplierzm",
                 "id,pznm_zmet_org,pznm_zmet_org.number,pznm_zmet_number,pznm_zmet_name,pznm_zmet_oldnumber,pznm_zmet_wtr,pznm_zmet_wtrphone," +
                         "pznm_zmet_lxr,pznm_zmet_lxrphone,pznm_zmet_cgper,pznm_zmet_setttype," +
-                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype",
+                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype,pznm_sourcesysid",
                 new QFilter[]{qFilter_customer,qFilter_org,qFilter_ztnumber});
         for(DynamicObject obj : isHaveObjs){
             DynamicObject org =  (DynamicObject) obj.getDynamicObject("pznm_zmet_org");
@@ -348,6 +348,8 @@ public class SupplierAddnewWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,update_entry);
+                //供应商子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,update_entry);
                 //供应商子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,update_entry);
                 //供应商子码.子码名称
@@ -393,6 +395,8 @@ public class SupplierAddnewWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,add_entry);
+                //供应商子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,add_entry);
                 //供应商子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,add_entry);
                 //供应商子码.子码名称

bamp/basedata/webapi/SupplierSaveWebApiPlugin.java

@@ -325,7 +325,7 @@ public class SupplierSaveWebApiPlugin implements Serializable {
         DynamicObject[] isHaveObjs = BusinessDataServiceHelper.load("pznm_supplierzm",
                 "id,pznm_zmet_org,pznm_zmet_org.number,pznm_zmet_number,pznm_zmet_name,pznm_zmet_oldnumber,pznm_zmet_wtr,pznm_zmet_wtrphone," +
                         "pznm_zmet_lxr,pznm_zmet_lxrphone,pznm_zmet_cgper,pznm_zmet_setttype," +
-                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype",
+                        "pznm_zmet_zqnotes,pznm_zmet_settday,pznm_zmet_zqrtype,pznm_zmet_zqptype,pznm_zmet_paytype,pznm_zmet_invoicetype,pznm_sourcesysid",
                 new QFilter[]{qFilter_customer,qFilter_org,qFilter_ztnumber});
         for(DynamicObject obj : isHaveObjs){
             DynamicObject org =  (DynamicObject) obj.getDynamicObject("pznm_zmet_org");
@@ -344,6 +344,8 @@ public class SupplierSaveWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,update_entry);
+                //供应商子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,update_entry);
                 //供应商子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,update_entry);
                 //供应商子码.子码名称
@@ -389,6 +391,8 @@ public class SupplierSaveWebApiPlugin implements Serializable {
 
                 setDynamicField(true,"pznm_zmet_org_number","pznm_zmet_org","bos_org",
                         mapEntry,resultData,add_entry);
+                //供应商子码.子码ID
+                setTextField(true,"pznm_sourcesysid","pznm_sourcesysid",mapEntry,resultData,add_entry);
                 //供应商子码.子码编码
                 setTextField(true,"pznm_zmet_number","number",mapEntry,resultData,add_entry);
                 //供应商子码.子码名称

scmc/sm/webapi/SalorderTfDataWebApiPlugin.java

@@ -2,5 +2,40 @@ package scmc.sm.webapi;
 
 import kd.bos.openapi.api.plugin.ApiSavePlugin;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class SalorderTfDataWebApiPlugin implements ApiSavePlugin {
+    @Override
+    public List<Map<String, Object>> preHandleRequestData(List<Map<String, Object>> reqData) {
+        for (Map<String, Object> map : reqData) {
+           if(map.get("billentry")!=null) {
+               List<Map> entryList = (ArrayList) map.get("billentry");
+               for(Map entryObj : entryList){
+                   //含税单价
+                   BigDecimal priceandtax = new BigDecimal(0);
+                   if (entryObj.get("priceandtax") != null || !"".equals(map.get("priceandtax"))) {
+                       priceandtax = new BigDecimal(entryObj.get("priceandtax").toString());
+                   }
+                   //折后含税单价
+                   BigDecimal pznm_discpriceandtax = new BigDecimal(0);
+                   if (entryObj.get("pznm_discpriceandtax") != null || !"".equals(map.get("pznm_discpriceandtax"))) {
+                       pznm_discpriceandtax = new BigDecimal(entryObj.get("pznm_discpriceandtax").toString());
+                   }
+
+                   BigDecimal cal = priceandtax.subtract(pznm_discpriceandtax);
+                   if (cal.compareTo(BigDecimal.ZERO) != 0) {
+                       entryObj.put("discounttype", "C");//折扣方式
+                       entryObj.put("discountamount", cal);//折扣额
+                   } else {
+                       entryObj.put("discounttype", "NULL");//折扣方式
+                   }
+               }
+           }
+        }
+        return reqData;
+    }
 }