fix: 销售出库提交差值

Reviewed-on: #5

src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java

@@ -93,7 +93,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
             calculatePremium(dataEntity);
 
         }
-
         ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
         yemCushscode(findByname);
     }
@@ -114,9 +113,10 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
                     String yemCushscodeString = yemCushscode.getString("number");
                     String yemDecmatericalname = dynamicObject.getString("yem_decmatericalname");
                     BigDecimal yemCusconsalesprice = dynamicObject.getBigDecimal("yem_cusconsalesprice");
-                    QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets.number", QCP.equals, yemCushscodeString);
-                    qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_codetsname", QCP.equals, yemDecmatericalname));
+                    QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets", QCP.equals, yemCushscodeString);
+                    qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_gname", QCP.equals, yemDecmatericalname));
                     qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_declprice", QCP.equals, yemCusconsalesprice));
+//                    qFilter.and("billno",QCP.equals,"431020240000181817");
                     String selectfield = DynamicObjectUtil.getSelectfields("yem_ca_cusdec", false);
                     String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_ca_cusdec", "yem_ca_cddetailedentry", false);
                     //单一窗口报关单
@@ -124,15 +124,13 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
                     if (load != null) {
                         DynamicObjectCollection dynamicObjectCollection1 = load.getDynamicObjectCollection("yem_ca_cddetailedentry");
                         for (DynamicObject object : dynamicObjectCollection1) {
-                            DynamicObject yemCodets = object.getDynamicObject("yem_codets");
+                            String yemCodets = object.getString("yem_codets");
                             BigDecimal bigDecimal = object.getBigDecimal("yem_declprice");
-                            String string = object.getString("yem_codetsname");
+                            String string = object.getString("yem_gname");
                             DynamicObject yemGunit = object.getDynamicObject("yem_gunit");
                             DynamicObject yemunit = object.getDynamicObject("yem_unit1");
                             DynamicObject yemUnit = object.getDynamicObject("yem_unit2");
-                            if (yemCodets != null) {
-                                String yemCodetsString = yemCodets.getString("number");
-                                if (yemCodetsString.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) {
+                                if (yemCodets.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) {
                                     DynamicObjectCollection dynamicObjectCollection2 = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c");
                                     for (DynamicObject dynamicObject1 : dynamicObjectCollection2) {
                                         long aLong = dynamicObject1.getLong("yem_sourcebillentryid");
@@ -142,7 +140,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
                                             dynamicObject1.set("yem_measurement", yemUnit);
                                         }
                                     }
-                                }
                             }
                         }
                     }

src/main/java/com/yem/wm/im/delivernotice/form/Delivernotice.java

@@ -1,6 +1,7 @@
 package com.yem.wm.im.delivernotice.form;
 
 import com.yem.wm.es.contractamtlist.util.FunUtil;
+import com.yem.wm.im.delivernotice.op.DeliverNoticeSubmitOp;
 import com.yem.wm.utils.FunctionalCommon;
 import com.yem.wm.utils.OrgFilterUtils;
 import com.yem.wm.utils.YEM;
@@ -102,6 +103,12 @@ public class Delivernotice extends AbstractBillPlugIn implements BeforeF7SelectL
             case "inventoryquery":
                 inventoryQuery();
                 break;
+            case "test_dosubmit":
+//                IDataModel model = this.getModel();
+//                DynamicObject dataEntity = model.getDataEntity(true);
+//                DeliverNoticeSubmitOp op = new DeliverNoticeSubmitOp();
+//                op.setValueToStorage(dataEntity);
+                break;
         }
     }
 

src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeSubmitOp.java

@@ -175,7 +175,9 @@ public class DeliverNoticeSubmitOp extends AbstractOperationServicePlugIn {
         DynamicObjectCollection entryDeliver = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo");
         for (DynamicObject entry : entryDeliver) {
             map.put(entry.getLong("yem_sourceentryid"), entry.getBigDecimal("yem_qty"));
-            mapAmount.put(entry.getLong("yem_sourceentryid"), entry.getBigDecimal("yem_amountandtax"));
+            BigDecimal amountandtax = entry.getBigDecimal("yem_amountandtax");
+            amountandtax = amountandtax.setScale(2, RoundingMode.HALF_UP);
+            mapAmount.put(entry.getLong("yem_sourceentryid"), amountandtax);
         }
         Set<Long> longs = map.keySet();
         String selectfields = DynamicObjectUtil.getSelectfields("yem_es_storagetrans");
@@ -189,6 +191,11 @@ public class DeliverNoticeSubmitOp extends AbstractOperationServicePlugIn {
                 for (DynamicObject entry : materialinfo) {
                     long sourceentryid = entry.getLong("yem_sourceentryid");
                     if (map.containsKey(sourceentryid)) {
+
+//                        entry.set("yem_adstqty", BigDecimal.ZERO);
+//                        entry.set("yem_adstamount", BigDecimal.ZERO);
+//                        entry.set("yem_sgnenumber", "");
+
                         BigDecimal yemAdstqty = entry.getBigDecimal("yem_adstqty");
                         BigDecimal yemAdstamount = entry.getBigDecimal("yem_adstamount");
                         BigDecimal decimal = map.get(sourceentryid);

src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeUnAuditOp.java

@@ -11,6 +11,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -85,7 +86,9 @@ public class DeliverNoticeUnAuditOp extends AbstractOperationServicePlugIn {
         DynamicObjectCollection entryDeliver = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo");
 
         for (DynamicObject entry : entryDeliver) {
-            map.put(entry.getLong("yem_sourceentryid"), Arrays.asList(entry.getBigDecimal("yem_qty"), entry.getBigDecimal("yem_amt")));
+            BigDecimal amountandtax = entry.getBigDecimal("yem_amountandtax");
+            amountandtax = amountandtax.setScale(2, RoundingMode.HALF_UP);
+            map.put(entry.getLong("yem_sourceentryid"), Arrays.asList(entry.getBigDecimal("yem_qty"), amountandtax));
         }
         Set<Long> longs = map.keySet();
 

src/main/java/kd/cosmic/Application.java

@@ -3,56 +3,38 @@ package kd.cosmic;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.cosmic.server.Launcher;
-import kd.cosmic.server.Launcher;
 
 /**
  * 启动本地应用程序(微服务节点)
  */
 public class Application {
-
     public static void main(String[] args) {
         Launcher cosmic = new Launcher();
-//
-//        cosmic.setClusterNumber("cosmic");
-//        cosmic.setTenantNumber("sample");
-//        cosmic.setServerIP("10.64.112.152");
-////        cosmic.set("fileserver", "http://10.64.112.152:30003/fileserver/");
-////        cosmic.set("imageServer.url", "http://10.64.112.152:30003/fileserver/");
-////        cosmic.set("attachmentServer.url", "http://10.64.112.152:30003/fileserver/");
-//
-//
-        cosmic.setAppName("cosmic-25655-N0OqzfBY");
-        cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp");
-//        cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092");
-//
-//        cosmic.setStartWithQing(false);
-//
-//        cosmic.start();
 
 //        cosmic.setClusterNumber("cosmic");
 //        cosmic.setTenantNumber("sample");
 //        cosmic.setServerIP("10.64.112.152");
-//
-//        cosmic.setAppName("cosmic-ZZSLL-6a9PvQR2");
-//        cosmic.setWebPath("D:/Code/ensign-server/webapp");
-//
-//        cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092");
 
-        ////152
+        cosmic.setAppName("cosmic-violet-GNfGyyH1");
+        cosmic.setWebPath("E:/Code/ensign_back/ensign-server/webapp");
+
+        //152
         cosmic.setClusterNumber("yxzg-topview-dev");
         cosmic.setTenantNumber("yxzg-topview-dev");
         cosmic.setServerIP("10.64.112.152");
-        cosmic.setFileServerPathIPAndPort("", "");
-        cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
-        System.setProperty("mq.debug.queue.tag", "wrxtest");
-        ////134
+        cosmic.setFileServerPathIPAndPort("","");
+        cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092");
+        cosmic.set("login.type","STANDALONE");
+
+//        134
 //        cosmic.setClusterNumber("yxzg-prod");
 //        cosmic.setTenantNumber("yxzg-prod");
 //        cosmic.setServerIP("10.64.111.134");
 //        cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
 
-        cosmic.setStartWithQing(false);
 
+        cosmic.setStartWithQing(false);
         cosmic.start();
     }
+
 }