Merge remote-tracking branch 'origin/master'

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java

@@ -710,10 +710,11 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
         billQuery.setFormId("SAL_DELIVERYNOTICE");
         billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FSOEntryId,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
         List<Map> filterString = new ArrayList<>();
-        //审核日期为昨日到现在且单据状态等于已审核且明细收件人地址不为空
+        //审核日期为昨日到现在且单据状态等于已审核且明细收件人电话不为空
         filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",1,"","","0"));//审核日期在今天之前XX天之后
         filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FDocumentStatus","105","C","","","0"));//单据状态等于XX
-        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDZ","52","","","","0"));//明细收件人地址不为空
+//        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDZ","52","","","","0"));//明细收件人地址不为空
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FHGReceiveDh","52","","","","0"));//明细收件人电话不为空
 //        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","420","2025-01-01","","","0"));//审核日期等于XX年
 //        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","63","","","","0"));//审核日期等于本月
 

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

@@ -29,6 +29,10 @@ public class CustomerModel extends Model{
 
     private FNumber FSELLER;//销售员
 
+    private FSTAFFNUMBER F_VMKV_Base1;//跟单员
+
+    private String F_VMKV_Combo1;//订单要求
+
     private FNumber FRECCONDITIONID;//收款条件
 
     private FNumber FTRADINGCURRID;//结算币别

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

@@ -7,7 +7,7 @@ public class SaleOrderEntry {
     private FNumber FMaterialId;//物料编码
     private String F_Sl_XSTYPE;//产品类别
 
-//    private FNumber FUnitID;
+    private FNumber FUnitID;//销售单位
     private double FQty;//销售数量
     private FNumber FPriceUnitId;
 //    private double FPriceUnitQty;
@@ -36,4 +36,12 @@ public class SaleOrderEntry {
     private double F_WMVJ_Amount;
     private double F_WMVJ_Qty;
     private boolean F_WMVJ_CheckBox;*/
+
+    private String F_VMKV_JSYQ;//技术要求
+    private String F_NLD_BR;//剩磁（Br）
+    private String F_NLD_Hcj;//内禀矫顽力（Hcj）
+    private String F_NLD_Hcb;//磁感矫顽力（Hcb）
+    private String F_NLD_BH;//最大磁能积（BH）max
+    private String F_NLD_Hk;//方形度Hk/Hcj
+    private String F_VMKV_GXYQ;//公差要求
 }

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

@@ -73,6 +73,7 @@ public class JinlunServiceImpl implements JinlunService {
 
         //商务信息
         FNumber FSELLER = new FNumber(UtilMap.getString(customerData,"ShortText1759997501370"));//销售员
+        FSTAFFNUMBER F_VMKV_Base1 = new FSTAFFNUMBER(UtilMap.getString(customerData,"Text1762059270203"));//跟单员
         FNumber FRECCONDITIONID = new FNumber(UtilMap.getString(customerData,"Dropdown1758199217950_key"));//收款条件
         FNumber FTRADINGCURRID = new FNumber(UtilMap.getString(customerData,"Dropdown1758199184443_key"));//结算币别
         FNumber FSETTLETYPEID = new FNumber(UtilMap.getString(customerData,"Dropdown1758199160962_key"));//结算方式
@@ -80,6 +81,7 @@ public class JinlunServiceImpl implements JinlunService {
         FNumber FTaxType = new FNumber(UtilMap.getString(customerData,"Dropdown1758199263660_key"));//税分类
         String FInvoiceType = UtilMap.getString(customerData,"Dropdown1758199247249_key");//发票类型
         Boolean FISCREDITCHECK = UtilMap.getBoolean(customerData,"Logic1758199516570");//启用信用管理
+        String F_VMKV_Combo1 = UtilMap.getString(customerData,"Dropdown1762058555728_key");//订单要求
 
         //开票信息
         String FINVOICEBANKACCOUNT = UtilMap.getString(customerData,"ShortText1758199605057");//银行账号
@@ -110,6 +112,7 @@ public class JinlunServiceImpl implements JinlunService {
         customerModel.setFCustTypeId(FCustTypeId);
         customerModel.setFDescription(FDescription);
         customerModel.setFSELLER(FSELLER);
+        customerModel.setF_VMKV_Base1(F_VMKV_Base1);
         customerModel.setFRECCONDITIONID(FRECCONDITIONID);
         customerModel.setFTRADINGCURRID(FTRADINGCURRID);
         customerModel.setFSETTLETYPEID(FSETTLETYPEID);
@@ -117,6 +120,7 @@ public class JinlunServiceImpl implements JinlunService {
         customerModel.setFTaxType(FTaxType);
         customerModel.setFInvoiceType(FInvoiceType);
         customerModel.setFISCREDITCHECK(FISCREDITCHECK);
+        customerModel.setF_VMKV_Combo1(F_VMKV_Combo1);
         customerModel.setFINVOICEBANKACCOUNT(FINVOICEBANKACCOUNT);
         customerModel.setFINVOICETITLE(FINVOICETITLE);
         customerModel.setFTAXREGISTERCODE(FTAXREGISTERCODE);
@@ -411,6 +415,8 @@ 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"));//销售单位
+
             String F_Sl_XSTYPE = UtilMap.getString(saleDetail, "Dropdown1758341293022_key");//产品类别
             Double FQty = UtilMap.getDouble(saleDetail, "Number1758341381523");//销售数量
             Double FTaxPrice = UtilMap.getDouble(saleDetail, "Number1758341424993");//含税单价
@@ -420,9 +426,17 @@ public class JinlunServiceImpl implements JinlunService {
             String FEntryNote = UtilMap.getString(saleDetail,"Date1758341499356");//备注
             Double F_VMKV_MPPRICE = UtilMap.getDouble(saleDetail, "Number1758341576099");//报价价格
             String F_VMKV_SCCQ1 = UtilMap.getString(saleDetail,"Dropdown1760425152219_key");//生产厂区
+            String F_VMKV_JSYQ = UtilMap.getString(saleDetail,"ShortText1762135907570");//技术要求
+            String F_NLD_BR = UtilMap.getString(saleDetail,"ShortText1762135907570");//剩磁（Br）
+            String F_NLD_Hcj = UtilMap.getString(saleDetail,"ShortText1762135907570");//内禀矫顽力（Hcj）
+            String F_NLD_Hcb = UtilMap.getString(saleDetail,"ShortText1762135907570");//磁感矫顽力（Hcb）
+            String F_NLD_BH = UtilMap.getString(saleDetail,"ShortText1762135907570");//最大磁能积（BH）max
+            String F_NLD_Hk = UtilMap.getString(saleDetail,"ShortText1762135907570");//方形度Hk/Hcj
+            String F_VMKV_GXYQ = UtilMap.getString(saleDetail,"ShortText1762135907570");//公差要求
 
             SaleOrderEntry saleOrderEntry = new SaleOrderEntry();
             saleOrderEntry.setFMaterialId(FMaterialId);
+            saleOrderEntry.setFUnitID(FUnitID);
             saleOrderEntry.setF_Sl_XSTYPE(F_Sl_XSTYPE);
             saleOrderEntry.setFQty(FQty);
             saleOrderEntry.setFTaxPrice(FTaxPrice);
@@ -432,6 +446,14 @@ public class JinlunServiceImpl implements JinlunService {
             saleOrderEntry.setFEntryNote(FEntryNote);
             saleOrderEntry.setF_VMKV_MPPRICE(F_VMKV_MPPRICE);
             saleOrderEntry.setF_VMKV_SCCQ1(F_VMKV_SCCQ1);
+            saleOrderEntry.setF_VMKV_JSYQ(F_VMKV_JSYQ);
+            saleOrderEntry.setF_NLD_BR(F_NLD_BR);
+            saleOrderEntry.setF_NLD_Hcj(F_NLD_Hcj);
+            saleOrderEntry.setF_NLD_Hcb(F_NLD_Hcb);
+            saleOrderEntry.setF_NLD_BH(F_NLD_BH);
+            saleOrderEntry.setF_NLD_Hk(F_NLD_Hk);
+            saleOrderEntry.setF_VMKV_GXYQ(F_VMKV_GXYQ);
+
 
             saleOrderEntryList.add(saleOrderEntry);
         }

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

@@ -150,7 +150,7 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
 
         BillQuery billQuery = new BillQuery();
         billQuery.setFormId("SAL_OUTSTOCK");
-        billQuery.setFieldKeys("FBillNo,FBillTypeID.FName,FDate,FSettleCurrID.FName,FCustomerID.FName,FCustomerID.FShortName,FHeadLocationID.FName,FMaterialID.FNumber,FMaterialID.FName,FMaterialID.FSpecification,FPriceUnitQty,FRealQty,FPriceUnitId.FName,FBaseUnitID.FName,FIsFree,FPrice,FTaxPrice,FAmount,FAllAmount,FDiscount,FEntrynote");
+        billQuery.setFieldKeys("FBillNo,FBillTypeID.FName,FDate,FSettleCurrID.FName,FCustomerID.FName,FCustomerID.FShortName,FHeadLocationID.FName,FMaterialID.FNumber,FMaterialID.FName,FMaterialID.FSpecification,FMaterialID.F_Sl_ducengid,F_VMKV_Text_WLZT,FPriceUnitQty,FRealQty,FPriceUnitId.FName,FBaseUnitID.FName,FIsFree,FPrice,FTaxPrice,FEntryTaxRate,FAmount,FAllAmount,FDiscount,FEntrynote");
         List<Map> filterString = new ArrayList<>();
 
         //审核日期为昨天至今天
@@ -197,6 +197,9 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
             entryMap.put("ShortText1760153773163",UtilMap.getString(saleOut,"FMaterialID.FNumber"));//物料编码
             entryMap.put("Text1760153778635",UtilMap.getString(saleOut,"FMaterialID.FName"));//物料名称
             entryMap.put("Text1760153786986",UtilMap.getString(saleOut,"FMaterialID.FSpecification"));//规格型号
+            entryMap.put("ShortText1762245895776",UtilMap.getString(saleOut,"FMaterialID.F_Sl_ducengid"));//镀锌
+            entryMap.put("Text1762245901183",UtilMap.getString(saleOut,"F_VMKV_Text_WLZT"));//物料状态
+
             entryMap.put("Number1760153811668",UtilMap.getDouble(saleOut,"FPriceUnitQty"));//计价数量
             entryMap.put("Number1760153958907",UtilMap.getDouble(saleOut,"FRealQty"));//实发数量
             entryMap.put("Text1760153793403",UtilMap.getString(saleOut,"FPriceUnitId.FName"));//计价单位
@@ -204,6 +207,7 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
             entryMap.put("Logic1760171983887",UtilMap.getBoolean(saleOut,"FIsFree"));//是否赠品
             entryMap.put("Number1760153991898",UtilMap.getDouble(saleOut,"FPrice"));//单价
             entryMap.put("Number1760154006703",UtilMap.getDouble(saleOut,"FTaxPrice"));//计价单价
+            entryMap.put("Number1762225120251",UtilMap.getDouble(saleOut,"FEntryTaxRate"));//税率
             entryMap.put("Number1760154034052",UtilMap.getDouble(saleOut,"FAmount"));//金额
             entryMap.put("Number1760154039959",UtilMap.getDouble(saleOut,"FAllAmount"));//价税合计
             entryMap.put("Number1760154058940",UtilMap.getDouble(saleOut,"FDiscount"));//折扣额