需求

src/main/java/com/zfire/mall/manager/bean/k3/bill/SalesOrderItemBean.java

@@ -76,10 +76,10 @@ public class SalesOrderItemBean {
     @ApiModelProperty(value = "金蝶部门编号", required = false)
     private Map<String,String> k3OrgNumber = new HashMap<>();
 
-    public void setfOrderEntryPlan(String fDate){
+    public void setfOrderEntryPlan(String forDate){
         Map<String,Object> map = new HashMap<>();
         map.put("FPlanQty",qty);
-        map.put(KingDeeCons.FPLAN_DATE,fDate);
+        map.put(KingDeeCons.FPLAN_DATE,forDate);
         fOrderEntryPlan.add(map);
     }
 

src/main/java/com/zfire/mall/manager/bean/k3/v2/KingDeePurchaseOrderVO.java

@@ -27,7 +27,7 @@ public class KingDeePurchaseOrderVO {
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "采购日期")
-    private Date fDate;
+    private Date forDate;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "单据类型")

src/main/java/com/zfire/mall/manager/bean/k3/v2/KingDeePurchaseStockInVO.java

@@ -32,7 +32,7 @@ public class KingDeePurchaseStockInVO {
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "入库日期")
-    private Date fDate;
+    private Date forDate;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "收料组织")

src/main/java/com/zfire/mall/manager/bean/k3/v2/KingTransferVO.java

@@ -29,7 +29,7 @@ public class KingTransferVO {
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "日期")
-    private Date fDate;
+    private Date forDate;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "调入库存组织")

src/main/java/com/zfire/mall/manager/bean/stock/KingDeeOtherStockInVO.java

@@ -44,7 +44,7 @@ public class KingDeeOtherStockInVO  {
 
     @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "日期")
-    private Date fDate;
+    private Date forDate;
 
     @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "货主类型")

src/main/java/com/zfire/mall/manager/bean/stock/KingDeeOtherStockOutVO.java

@@ -38,7 +38,7 @@ public class KingDeeOtherStockOutVO   {
     private String billNo;
 
     @ApiModelProperty(value = "入库日期")
-    private Date fDate;
+    private Date forDate;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "库存组织")

src/main/java/com/zfire/mall/manager/bean/stock/KingDeePurchaseStockOutVO.java

@@ -35,7 +35,7 @@ public class KingDeePurchaseStockOutVO   {
 
     @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "退料日期")
-    private Date fDate;
+    private Date forDate;
 
     @ZfireField(tbName = "kdpso")
     @ApiModelProperty(value = "采购组织")

src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockInLogic.java

@@ -54,7 +54,7 @@ public class K3OtherStockInLogic {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
-        kingDeePurchaseStockInAdd.setFDate(new Date());
+        kingDeePurchaseStockInAdd.setForDate(new Date());
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseOrderLogic.java

@@ -48,7 +48,7 @@ public class K3PurchaseOrderLogic {
 //        request.setFilterString(String.format(filterStr, orgNumber));
 //        request.setOrderString("FID ASC");
 //
-//        String[] fields = new String[]{"id","billNo","businessType","fDate","billType","assignSupplierId","purchaseDeptId","purchaserId","payConditionId","approverName","creatorName",
+//        String[] fields = new String[]{"id","billNo","businessType","forDate","billType","assignSupplierId","purchaseDeptId","purchaserId","payConditionId","approverName","creatorName",
 //                "changerName","billAllAmount","billAmount","billTaxAmount","settleCurr"};
 //        List<KingDeePurchaseOrder> objects = k3Logic.allSync(request, fields, KingDeePurchaseOrder.class);
 //        if (!CollectionUtils.isEmpty(objects)) {
@@ -94,7 +94,7 @@ public class K3PurchaseOrderLogic {
         for (KingDeePurchaseOrderBean kingDeePurchaseOrderBean : kingDeePurchaseOrderBeanList) {
             List<Object> row = new ArrayList<>();
             row.add(kingDeePurchaseOrderBean.getBusinessType());
-            row.add(kingDeePurchaseOrderBean.getFDate());
+            row.add(kingDeePurchaseOrderBean.getForDate());
             row.add(kingDeePurchaseOrderBean.getBillNo());
             row.add(kingDeePurchaseOrderBean.getAssignSupplierId());
             row.add(kingDeePurchaseOrderBean.getPurchaseDeptId());

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockInLogic.java

@@ -68,7 +68,7 @@ public class K3PurchaseStockInLogic {
 //        request.setFilterString(String.format(filterStr, orgNumber));
 //        request.setOrderString("FID ASC");
 //
-//        String[] fields = new String[]{"id","billNo","fDate","stockOrgId","demandOrgId","purchaseOrgId","supplierId","stockDeptId","approverId","approveDate","cancellerId","cancelDate",
+//        String[] fields = new String[]{"id","billNo","forDate","stockOrgId","demandOrgId","purchaseOrgId","supplierId","stockDeptId","approverId","approveDate","cancellerId","cancelDate",
 //                "supplyName"};
 //        List<KingDeePurchaseStockIn> objects = k3Logic.allSync(request, fields, KingDeePurchaseStockIn.class);
 //        if (!CollectionUtils.isEmpty(objects)) {
@@ -123,7 +123,7 @@ public class K3PurchaseStockInLogic {
         for (KingDeePurchaseStockInBean kingDeePurchaseStockInBean : kingDeePurchaseStockInBeanList) {
             List<Object> row = new ArrayList<>();
             row.add(kingDeePurchaseStockInBean.getBillNo());
-            row.add(DateUtil.formatDate(kingDeePurchaseStockInBean.getFDate()));
+            row.add(DateUtil.formatDate(kingDeePurchaseStockInBean.getForDate()));
             row.add(kingDeePurchaseStockInBean.getStockId());
             row.add(kingDeePurchaseStockInBean.getSupplyName());
             row.add(DateUtil.formatDate(kingDeePurchaseStockInBean.getApproveDate()));
@@ -154,7 +154,7 @@ public class K3PurchaseStockInLogic {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
-        kingDeePurchaseStockInAdd.setFDate(new Date());
+        kingDeePurchaseStockInAdd.setForDate(new Date());
 
         kingDeePurchaseStockInAdd.insert();
 

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockOutLogic.java

@@ -53,7 +53,7 @@ public class K3PurchaseStockOutLogic {
         kingDeePurchaseStockInAdd.setId(IdWorker.getIdStr());
         kingDeePurchaseStockInAdd.setBillNo(kingDeePurchaseStockInAdd.getId());
         kingDeePurchaseStockInAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
-        kingDeePurchaseStockInAdd.setFDate(new Date());
+        kingDeePurchaseStockInAdd.setForDate(new Date());
         kingDeePurchaseStockInAdd.insert();
 
         List<StockCorrespond> list = stockCorrespondService.lambdaQuery().list();

src/main/java/com/zfire/mall/manager/logic/k3/K3TransferLogic.java

@@ -65,7 +65,7 @@ public class K3TransferLogic {
 //        request.setFilterString(String.format(filterStr, orgNumber));
 //        request.setOrderString("FID ASC");
 //
-//        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","fDate","approveDate","cancelDate"};
+//        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","forDate","approveDate","cancelDate"};
 //        List<KingDeeTransfer> objects = k3Logic.allSync(request, fields, KingDeeTransfer.class);
 //        syncTransferItem(orgId,orgNumber,startTime,endTime);
 //        if (CollectionUtils.isNotEmpty(objects)) {
@@ -127,7 +127,7 @@ public class K3TransferLogic {
             row.add(kingTransfer.getBillNo());
             row.add(kingTransfer.getBillType());
             row.add(kingTransfer.getTransferBizType());
-            row.add(kingTransfer.getFDate());
+            row.add(kingTransfer.getForDate());
             row.add(kingTransfer.getDocumentStatus());
             row.add(kingTransfer.getCancelStatus());
             row.add(kingTransfer.getMaterialNumber());
@@ -148,7 +148,7 @@ public class K3TransferLogic {
     public void add(KingTransferAddOrUp kingTransferAdd) {
         kingTransferAdd.setId(IdWorker.getIdStr());
         kingTransferAdd.setBillNo(kingTransferAdd.getId());
-        kingTransferAdd.setFDate(new Date());
+        kingTransferAdd.setForDate(new Date());
         kingTransferAdd.setCancelStatus(ExamineStatusEnum.WAIT.getKey());
         kingTransferAdd.insert();
 

src/main/java/com/zfire/mall/manager/logic/saletype/SaleOrderLogic.java

@@ -1508,7 +1508,7 @@ public class SaleOrderLogic {
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
 
-        String[] fields = new String[]{"id", "billNo", "fDate", "stockOrgId", "approverId", "approveDate", "cancelDate",
+        String[] fields = new String[]{"id", "billNo", "forDate", "stockOrgId", "approverId", "approveDate", "cancelDate",
                 "note", "fdDocumentStatus,stockDirect"};
         request.setNotTime(true);
         List<KingDeeOtherStockOut> objects = k3Logic.allSync(request, fields, KingDeeOtherStockOut.class);
@@ -1686,7 +1686,7 @@ public class SaleOrderLogic {
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
 
-        String[] fields = new String[]{"id", "billNo", "fDate", "stockOrgId", "approverId", "approveDate", "cancelDate",
+        String[] fields = new String[]{"id", "billNo", "forDate", "stockOrgId", "approverId", "approveDate", "cancelDate",
                 "note", "fdDocumentStatus", "stockDirect"};
         request.setNotTime(true);
         List<KingDeeOtherStockOut> objects = k3Logic.allSync(request, fields, KingDeeOtherStockOut.class);

src/main/java/com/zfire/mall/manager/logic/stock/StockCommonLogic.java

@@ -1110,7 +1110,7 @@ public class StockCommonLogic {
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
         request.setNotTime(true);
-        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","fDate","approveDate","cancelDate"};
+        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","forDate","approveDate","cancelDate"};
         List<KingDeeTransfer> objects = k3Logic.allSync(request, fields, KingDeeTransfer.class);
         /**
          *  全量查询表中不为已审核状态的单，退回数量，再删除数据，等下次审核
@@ -1282,7 +1282,7 @@ public class StockCommonLogic {
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
         request.setNotTime(true);
-        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","fDate","approveDate","cancelDate"};
+        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","forDate","approveDate","cancelDate"};
         List<KingDeeTransfer> objects = k3Logic.allSync(request, fields, KingDeeTransfer.class);
 
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {

src/main/resources/mapper/TransferMapper.xml

@@ -28,7 +28,7 @@
         <result column="supply_org_id" jdbcType="VARCHAR" property="supplyOrgId"/>
 
         <result column="bill_no" jdbcType="VARCHAR" property="billNo"/>
-        <result column="f_date" jdbcType="TIMESTAMP" property="fDate"/>
+        <result column="f_date" jdbcType="TIMESTAMP" property="forDate"/>
         <result column="stock_org_id" jdbcType="VARCHAR" property="stockOrgId"/>
         <result column="stock_out_org_id" jdbcType="VARCHAR" property="stockOutOrgId"/>
         <result column="transfer_biz_type" jdbcType="VARCHAR" property="transferBizType"/>
@@ -109,7 +109,7 @@
         <id column="id" jdbcType="VARCHAR" property="id"/>
         <result column="bill_no" jdbcType="VARCHAR" property="billNo"/>
         <result column="business_type" jdbcType="VARCHAR" property="businessType"/>
-        <result column="f_date" jdbcType="TIMESTAMP" property="fDate"/>
+        <result column="f_date" jdbcType="TIMESTAMP" property="forDate"/>
         <result column="bill_type" jdbcType="VARCHAR" property="billType"/>
         <result column="assign_supplier_id" jdbcType="VARCHAR" property="assignSupplierId"/>
         <result column="purchase_dept_id" jdbcType="VARCHAR" property="purchaseDeptId"/>
@@ -200,7 +200,7 @@
         <result column="supply_org_id" jdbcType="VARCHAR" property="supplyOrgId"/>
         <result column="f_id" jdbcType="VARCHAR" property="fId"/>
         <result column="bill_no" jdbcType="VARCHAR" property="billNo"/>
-        <result column="f_date" jdbcType="TIMESTAMP" property="fDate"/>
+        <result column="f_date" jdbcType="TIMESTAMP" property="forDate"/>
         <result column="stock_org_id" jdbcType="VARCHAR" property="stockOrgId"/>
         <result column="demand_org_id" jdbcType="VARCHAR" property="demandOrgId"/>
         <result column="purchase_org_id" jdbcType="VARCHAR" property="purchaseOrgId"/>