销售订单新增字段

mjava-jinlun/src/main/java/com/malk/jinlun/entity/SaleOrderEntry.java

@@ -9,8 +9,8 @@ public class SaleOrderEntry {
 
     private FNumber FUnitID;//销售单位
     private double FQty;//销售数量
-    private FNumber FPriceUnitId;
-//    private double FPriceUnitQty;
+    private FNumber FPriceUnitId;//计价单位
+    private double FPriceUnitQty;//计价数量
 //    private double FPrice;
     private double FTaxPrice;//含税单价
 
@@ -44,4 +44,8 @@ public class SaleOrderEntry {
     private String F_NLD_BH;//最大磁能积（BH）max
     private String F_NLD_Hk;//方形度Hk/Hcj
     private String F_VMKV_GXYQ;//公差要求
+
+    boolean FDeliveryControl;//控制发货数量
+    Double FDeliveryMaxQty;//发货上限
+    Double FDeliveryMinQty;//发货下限
 }

mjava-jinlun/src/main/java/com/malk/jinlun/service/impl/JinlunServiceImpl.java

@@ -416,9 +416,12 @@ public class JinlunServiceImpl implements JinlunService {
         for (Map saleDetail : saleDetailList) {
             FNumber FMaterialId = new FNumber(UtilMap.getString(saleDetail, "ShortText1758341332222"));//物料编码
             FNumber FUnitID = new FNumber(UtilMap.getString(saleDetail, "Text1758341368975"));//销售单位
+            Double FQty = UtilMap.getDouble(saleDetail, "Number1758341381523");//销售数量
+            FNumber FPriceUnitId = new FNumber(UtilMap.getString(saleDetail, "Text1763091074956"));//计价单位
+            Double FPriceUnitQty = UtilMap.getDouble(saleDetail, "Number1763091134020");//计价数量
 
             String F_Sl_XSTYPE = UtilMap.getString(saleDetail, "Dropdown1758341293022_key");//产品类别
-            Double FQty = UtilMap.getDouble(saleDetail, "Number1758341381523");//销售数量
+
             Double FTaxPrice = UtilMap.getDouble(saleDetail, "Number1758341424993");//含税单价
             boolean FIsFree = UtilMap.getBoolean(saleDetail,"Logic1758341430353");//是否赠品
             Double FEntryTaxRate = UtilMap.getDouble(saleDetail, "Number1758349078527");//税率
@@ -434,9 +437,18 @@ public class JinlunServiceImpl implements JinlunService {
             String F_NLD_Hk = UtilMap.getString(saleDetail,"ShortText1762135907570");//方形度Hk/Hcj
             String F_VMKV_GXYQ = UtilMap.getString(saleDetail,"ShortText1762135907570");//公差要求
 
+            boolean FDeliveryControl = UtilMap.getBoolean(saleDetail,"Logic1763091193161");//控制发货数量
+            Double FDeliveryMaxQty = UtilMap.getDouble(saleDetail, "Number1763091294543");//发货上限
+            Double FDeliveryMinQty = UtilMap.getDouble(saleDetail, "Number1763091312359");//发货下限
+
+            //todo 订单图纸附件上传
+
+
             SaleOrderEntry saleOrderEntry = new SaleOrderEntry();
             saleOrderEntry.setFMaterialId(FMaterialId);
             saleOrderEntry.setFUnitID(FUnitID);
+            saleOrderEntry.setFPriceUnitId(FPriceUnitId);
+            saleOrderEntry.setFPriceUnitQty(FPriceUnitQty);
             saleOrderEntry.setF_Sl_XSTYPE(F_Sl_XSTYPE);
             saleOrderEntry.setFQty(FQty);
             saleOrderEntry.setFTaxPrice(FTaxPrice);
@@ -453,7 +465,9 @@ public class JinlunServiceImpl implements JinlunService {
             saleOrderEntry.setF_NLD_BH(F_NLD_BH);
             saleOrderEntry.setF_NLD_Hk(F_NLD_Hk);
             saleOrderEntry.setF_VMKV_GXYQ(F_VMKV_GXYQ);
-
+            saleOrderEntry.setFDeliveryControl(FDeliveryControl);
+            saleOrderEntry.setFDeliveryMaxQty(FDeliveryMaxQty);
+            saleOrderEntry.setFDeliveryMinQty(FDeliveryMinQty);
 
             saleOrderEntryList.add(saleOrderEntry);
         }

mjava-jinlun/src/main/java/com/malk/jinlun/service/impl/JinlunTaskServiceImpl.java

@@ -425,7 +425,7 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
 
         BillQuery billQuery = new BillQuery();
         billQuery.setFormId("AR_receivable");
-        billQuery.setFieldKeys("FBillTypeID.FName,FBillNo,FCUSTOMERID.FName,FSALEERID.FName,F_VMKV_Base_qtr.FName,FSetAccountType,FCURRENCYID.FName,FDate,FENDDATE_H,FPayConditon.FName,FALLAMOUNTFOR,FEntityDetail_FEntryID,FMATERIALID.FNumber,FMATERIALID.FName,FMATERIALID.F_Sl_xingnengid,FPRICEUNITID.FName,FPriceQty,FTaxPrice,FPrice,FEntryTaxRate,FNoTaxAmountFor_D,FTAXAMOUNTFOR_D,FALLAMOUNTFOR_D,FIsFree,FBASICUNITQTY,FLot.FName,FRECEIVEAMOUNT,FComment");
+        billQuery.setFieldKeys("FBillTypeID.FName,FBillNo,FCUSTOMERID.FName,FSALEERID.FName,F_VMKV_Base_qtr.FName,FSetAccountType,FCURRENCYID.FName,FDate,FENDDATE_H,FPayConditon.FName,FALLAMOUNTFOR,FEntityDetail_FEntryID,FMATERIALID.FNumber,FMATERIALID.FName,FMATERIALID.F_Sl_xingnengid,FPRICEUNITID.FName,FPriceQty,FStockUnitId.FName,FStockQty,FSalUnitId.FName,FSalQty,FTaxPrice,FPrice,FEntryTaxRate,FNoTaxAmountFor_D,FTAXAMOUNTFOR_D,FALLAMOUNTFOR_D,FIsFree,FLot.FName,FRECEIVEAMOUNT,FComment");
         List<Map> filterString = new ArrayList<>();
 
         //审核日期为昨天至今天
@@ -481,7 +481,7 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
 
             data.put("ShortText1760602218380",UtilMap.getString(receipt,"FPayConditon.FName"));//收款条件
             data.put("ShortText1760602197718",UtilMap.getString(receipt,"FCURRENCYID.FName"));//币别
-            data.put("Number1760602528131",UtilMap.getString(receipt,"FALLAMOUNTFOR"));//价税合计
+            data.put("Number1760602528131",UtilMap.getDouble(receipt,"FALLAMOUNTFOR"));//价税合计
             data.put("Date1760602209998",UtilMap.getString(receipt,"FENDDATE_H").replace("T"," "));//到期日
 
             List<Map> entry = new ArrayList<>();
@@ -490,20 +490,47 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
             entryMap.put("ShortText1760602287318",UtilMap.getString(receipt,"FMATERIALID.FNumber"));//物料编码
             entryMap.put("Text1760602292846",UtilMap.getString(receipt,"FMATERIALID.FName"));//物料名称
             entryMap.put("Text1760602314150",UtilMap.getString(receipt,"FMATERIALID.F_Sl_xingnengid"));//性能
-            entryMap.put("Text1760602299878",UtilMap.getString(receipt,"FPRICEUNITID.FName"));//计价单位
-            entryMap.put("Number1760602320518",UtilMap.getString(receipt,"FPriceQty"));//计价数量
-            entryMap.put("Number1760602330651",UtilMap.getString(receipt,"FTaxPrice"));//含税单价
-            entryMap.put("Number1760602338551",UtilMap.getString(receipt,"FPrice"));//单价
-            entryMap.put("Number1760602343876",UtilMap.getString(receipt,"FEntryTaxRate"));//税率
-            entryMap.put("Number1760602347414",UtilMap.getString(receipt,"FNoTaxAmountFor_D"));//不含税金额
-            entryMap.put("Number1760602354115",UtilMap.getString(receipt,"FTAXAMOUNTFOR_D"));//税额
-            entryMap.put("Number1760602359012",UtilMap.getString(receipt,"FALLAMOUNTFOR_D"));//价税合计
+            String jjdw = UtilMap.getString(receipt, "FPRICEUNITID.FName");
+            entryMap.put("Text1760602299878", jjdw);//计价单位
+            Double jjsl = UtilMap.getDouble(receipt, "FPriceQty");
+            entryMap.put("Number1760602320518", jjsl);//计价数量
+            String kcdw = UtilMap.getString(receipt, "FStockUnitId.FName");
+            entryMap.put("Text1762914941284", kcdw);//库存单位
+            Double kcsl = UtilMap.getDouble(receipt, "FStockQty");
+            entryMap.put("Number1762914960910", kcsl);//库存数量
+            String xsdw = UtilMap.getString(receipt, "FSalUnitId.FName");
+            entryMap.put("Text1762914943634", xsdw);//销售单位
+            Double xssl = UtilMap.getDouble(receipt, "FSalQty");
+            entryMap.put("Number1762914972786", xssl);//销售数量
+            entryMap.put("Number1760602330651",UtilMap.getDouble(receipt,"FTaxPrice"));//含税单价
+            entryMap.put("Number1760602338551",UtilMap.getDouble(receipt,"FPrice"));//单价
+            entryMap.put("Number1760602343876",UtilMap.getDouble(receipt,"FEntryTaxRate"));//税率
+            entryMap.put("Number1760602347414",UtilMap.getDouble(receipt,"FNoTaxAmountFor_D"));//不含税金额
+            entryMap.put("Number1760602354115",UtilMap.getDouble(receipt,"FTAXAMOUNTFOR_D"));//税额
+            entryMap.put("Number1760602359012",UtilMap.getDouble(receipt,"FALLAMOUNTFOR_D"));//价税合计
             entryMap.put("Logic1760602369561",UtilMap.getString(receipt,"FIsFree"));//是否赠品
-            entryMap.put("Number1760602378666",UtilMap.getString(receipt,"FBASICUNITQTY"));//销售基本数量
+
             entryMap.put("ShortText1760602387059",UtilMap.getString(receipt,"FLot.FName"));//批号
-            entryMap.put("Number1760602396337",UtilMap.getString(receipt,"FRECEIVEAMOUNT"));//已结算金额
+            entryMap.put("Number1760602396337",UtilMap.getDouble(receipt,"FRECEIVEAMOUNT"));//已结算金额
             entryMap.put("Text1760602391849",UtilMap.getString(receipt,"FComment"));//备注
 
+            double sl = 0.0;
+            double zl = 0.0;
+            if ("Pcs".equals(jjdw)) {
+                sl = jjsl;
+                if ("Kg".equals(xsdw)) {
+                    zl = kcsl;
+                }
+            }else {
+                zl = jjsl;
+                if ("Pcs".equals(kcdw)) {
+                    sl = kcsl;
+                }
+            }
+
+            entryMap.put("Number1762915279108", sl);//数量
+            entryMap.put("Number1762915289424", zl);//重量
+
             entry.add(entryMap);
 
             data.put("Sheet1760602277185",entry);