Merge remote-tracking branch 'origin/develop' into develop

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

@@ -31,9 +31,9 @@ public class K3CustomerLogic {
 
         // 登录成功调客户接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.CUSTOMER_INFO, startTime, endTime);
-        String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s " + k3Logic.supplySql(request.getStartTime(), request.getEndTime());
+        String filterStr = "FGroup.FNumber in ('DD','DFDS','FSQD','FSSH','FSZK','GZQD','GZSH','GZZK','LSFX','SHFX','SY','ZYDS') AND FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s " + k3Logic.supplySql(request.getStartTime(), request.getEndTime());
         request.setFieldKeys("FCUSTID,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName,FTEL,FSALDEPTID.FNumber,FSALDEPTID.FName," +
-                "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL,F_kls_Text");
+                "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL");
 //        request.setFieldKeys("FNUMBER,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName,FTEL,FSALDEPTID.FNumber,FSALDEPTID.FName," +
 //                "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL,F_kls_Text");
         request.setFilterString(String.format(filterStr, orgNumber));
@@ -41,7 +41,7 @@ public class K3CustomerLogic {
 
 
         String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","mobile","saleDeptNumber","saleDeptName",
-        "invoiceTitle","taxNo","bank","bankAccount","invoicePhone","invoiceAddress","email","province","city","region","secondCustomerNumber"};
+        "invoiceTitle","taxNo","bank","bankAccount","invoicePhone","invoiceAddress","email","province","city","region"};
         List<KingDeeCustomer> objects = k3Logic.allSync(request, fields, KingDeeCustomer.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
             kingDeeCustomerService.saveOrUpdateBatch(objects);

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

@@ -56,18 +56,20 @@ public class K3Logic {
 
         //多拿1个审核时间作为结束时间,此字段会比实际反射的实体类要多，所以最后一个字段在反射的时候不处理
         //即时库存没审核时间
-        if(!requestApiBean.getFormId().equals(KingDeeCons.STOCK_AMOUNT)) {
-            if (requestApiBean.getFormId().equals(KingDeeCons.DEPT_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.ORG_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.SUPPLIER_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.STOCK_INFO)) {
-                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAuditDate");
-            } else if (requestApiBean.getFormId().equals(KingDeeCons.CUSTOMER_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.OTHER_IN_STOCK)
-                    || requestApiBean.getFormId().equals(KingDeeCons.WALLET_FKD)) {
-                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAPPROVEDATE");
-            } else {
-                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FApproveDate");
+        if (!requestApiBean.getFieldKeys().contains(",FApproveDate")) {
+            if (!requestApiBean.getFormId().equals(KingDeeCons.STOCK_AMOUNT)) {
+                if (requestApiBean.getFormId().equals(KingDeeCons.DEPT_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.ORG_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.SUPPLIER_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.STOCK_INFO)) {
+                    requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAuditDate");
+                } else if (requestApiBean.getFormId().equals(KingDeeCons.CUSTOMER_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.OTHER_IN_STOCK)
+                        || requestApiBean.getFormId().equals(KingDeeCons.WALLET_FKD)) {
+                    requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAPPROVEDATE");
+                } else {
+                    requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FApproveDate");
+                }
             }
         }
 

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

@@ -41,20 +41,20 @@ public class K3MaterialLogic {
         String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s "+ k3Logic.supplySql(request.getStartTime(), request.getEndTime());
         request.setFieldKeys("FMATERIALID,FNumber,FName,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName, FCategoryID, FCategoryID.FNUMBER,FCategoryID.FName, FSpecification,"
                 + "FBaseUnitId.FNumber,FBaseUnitId.FName,FStoreUnitID.FNumber,FStoreUnitID.FName,FSalePriceUnitId.FNumber,FSalePriceUnitId.FName,FPurchasePriceUnitId.FNumber,FPurchasePriceUnitId.FName,FTaxRateId.FTaxRate,"
-                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,F_tmt_Text,F_njdm_Text,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
-                + "F_pjdm_Text,F_pjxh1_Text,F_pjcspdm_Text,F_pjxh2_Text,FMaterialGroup.FName");
+                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,F_abcd_Text,"
+                + "FMaterialGroup.FName");
 //        request.setFieldKeys("FNumber,FNumber,FName,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName, FCategoryID, FCategoryID.FNUMBER,FCategoryID.FName, FSpecification,"
 //                + "FBaseUnitId.FNumber,FBaseUnitId.FName,FStoreUnitID.FNumber,FStoreUnitID.FName,FSalePriceUnitId.FNumber,FSalePriceUnitId.FName,FPurchasePriceUnitId.FNumber,FPurchasePriceUnitId.FName,FTaxRateId.FTaxRate,"
-//                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,F_tmt_Text,F_njdm_Text,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
+//                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
 //                + "F_pjdm_Text,F_pjxh1_Text,F_pjcspdm_Text,F_pjxh2_Text");
-        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setFilterString("FMaterialGroup.FNumber LIKE '01.0%' AND"+String.format(filterStr, orgNumber));
         request.setOrderString("FMATERIALID ASC");
 
         String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","categoryId","categoryNumber","categoryName","specification"
                 ,"baseUnitCode","baseUnitId","storeUnitCode","storeUnitId","salePriceUnitCode","salePriceUnitId","purchasePriceUnitCode","purchasePriceUnitId",
                 "taxRateId","materialGroupNumber","isInventory","isSale","isPurchase"
-                ,"length","volume","width","height","oldNumber","tmtText","njdmText","njxhText","wjdmText","wjxhText","pjdmText","pjxh1Text"
-                ,"pjcspdmText","pjxh2Text","materialGroupName"};
+                ,"length","volume","width","height","oldNumber",
+                "materialGroupName"};
         List<KingDeeMaterial> objects = k3Logic.allSync(request, fields, KingDeeMaterial.class);
         if(CollectionUtils.isEmpty(objects)){
             return;

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

@@ -9,6 +9,7 @@ import com.zfire.mall.manager.constant.Constant;
 import com.zfire.mall.manager.constant.KingDeeCons;
 import com.zfire.mall.manager.logic.wallet.WalletLogic;
 import com.zfire.mall.manager.plus.entity.CustomerWallet;
+import com.zfire.mall.manager.plus.entity.KingDeeCustomer;
 import com.zfire.mall.manager.plus.entity.KingDeeReceipt;
 import com.zfire.mall.manager.plus.service.KingDeeCustomerService;
 import com.zfire.mall.manager.plus.service.KingDeeReceiptService;
@@ -77,7 +78,7 @@ public class K3ReceiptLogic {
 
         //付款单位 ： FPAYUNIT
         // 同步钱包接口
-        request.setFieldKeys("FRECEIVEBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FRECAMOUNTFOR_E,F_kls_Assistant1,FCONTACTUNIT,FREALRECAMOUNTFOR_D,FDATE," +
+        request.setFieldKeys("FRECEIVEBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FRECAMOUNTFOR_E,F_qwer_QB,FCONTACTUNIT,FREALRECAMOUNTFOR_D,FDATE," +
                 "FPAYUNIT,FSETTLEDISTAMOUNTFOR,FSALEDEPTID,FSALEERID,FREMARK,FACCOUNTID," +
                 "FSALEGROUPID,FSETTLETYPEID,FSETTLEORGID,FPAYORGID,FCURRENCYID,FPAYUNITTYPE,FApproveDate");
         request.setFilterString(String.format(filterStr));
@@ -128,7 +129,7 @@ public class K3ReceiptLogic {
     private void allSyncTkd(RequestApiBean request,String filterStr) throws Exception {
         //收款单位：FRECTUNIT
         // 同步钱包接口
-        request.setFieldKeys("FREFUNDBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALREFUNDAMOUNTFOR_D,F_kls_Assistant1, " +
+        request.setFieldKeys("FREFUNDBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALREFUNDAMOUNTFOR_D,F_qwer_QB," +
                 "FCONTACTUNIT,FREFUNDAMOUNTFOR_E,FDATE,FRECTUNIT, " +
                 "FSALEDEPTID,FSALEERID,FREMARK,FACCOUNTID,FSALEGROUPID, " +
                 "FSETTLETYPEID,FSETTLEORGID,FPAYORGID,FCURRENCYID,FRECTUNITTYPE,FApproveDate");
@@ -179,14 +180,14 @@ public class K3ReceiptLogic {
 
     private void allSyncFkd(RequestApiBean request,String filterStr) throws Exception {
         // 同步钱包接口
-        request.setFieldKeys("FPAYBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALPAYAMOUNTFOR_D,F_kls_Assistant1," +
-                " FCONTACTUNIT,FREALPAYAMOUNTFOR_D,FDATE,FSETTLEDISTAMOUNTFOR," +
+        request.setFieldKeys("FPAYBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALPAYAMOUNTFOR_D,F_qwer_QB," +
+                " FCONTACTUNIT,FDATE,FSETTLEDISTAMOUNTFOR," +
                 " FSETTLETYPEID,FREMARK,FACCOUNTID, " +
                 "FSETTLEORGID,FPAYORGID,FCURRENCYID,FOUTCONTACTTYPE,FApproveDate");
         request.setFilterString(String.format(filterStr));
         request.setOrderString("FID ASC");
         String[] fields = new String[]{"id","billNo","status","amount","walletId",
-                "customerId","hAmount","theTime","discount",
+                "customerId","theTime","discount",
                 "settleType","remark","bankAccount",
                 "settleOrg","skzz","bibie","customerType","examineTime"};
 
@@ -229,6 +230,11 @@ public class K3ReceiptLogic {
                 continue;
             }
 
+            KingDeeCustomer kingDeeCustomer = kingDeeCustomerService.getById(kingDeeReceipt.getCustomerId());
+            if (kingDeeCustomer == null){
+                continue;
+            }
+
             //本次同步过来的钱
             BigDecimal amount = kingDeeReceipt.getAmount();
             if(kingDeeReceipt.getStatus().equals("D")) {

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

@@ -41,7 +41,7 @@ public class K3WalletLogic {
     public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
         // 同步钱包接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.WALLET, startTime, endTime);
-        String filterStr = "FId='62a150496fabe3'"+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
+        String filterStr = "FId='64f93972aa7b46'"+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
         request.setFieldKeys("FEntryID,FNumber,FDataValue,FUseOrgId,FForbidStatus");
         //request.setFieldKeys("FNumber,FNumber,FDataValue,FUseOrgId,FForbidStatus");
         request.setFilterString(String.format(filterStr, orgNumber));

src/main/java/com/zfire/mall/manager/schedule/JiaXianSyncSchedule.java

@@ -23,11 +23,11 @@ import java.util.List;
 
 
 /**
- * 更新库存
+ *  嘉贤，格匠无用
  *
  * @author change
  */
-@Component
+//@Component
 @Slf4j
 public class JiaXianSyncSchedule {
 

src/main/java/com/zfire/mall/manager/schedule/K3Schedule.java

@@ -16,7 +16,7 @@ import java.util.Date;
 /**
  * 钱包充值同步
  */
-@Component
+//@Component
 @Slf4j
 public class K3Schedule {
 

src/main/java/com/zfire/mall/manager/schedule/SalesOrderSchedule.java

@@ -157,19 +157,19 @@ public class SalesOrderSchedule{
 
 
     /**
-     * 同步采购入库单
+     * 同步采购入库单 格匠的取消同步
      */
-    @Scheduled(fixedDelay = 30 * 1000)
+/*    @Scheduled(fixedDelay = 30 * 1000)
     public void automatic() throws Exception {
 
         HttpUtil.get(automaticPuUrl);
-    }
+    }*/
 
 
     /**
-     * 同步物流消息到发货单
+     * 同步物流消息到发货单    嘉贤取消同步
      */
-    @Scheduled(fixedDelay = 60 * 1000)
+    //@Scheduled(fixedDelay = 60 * 1000)
     public void automaticOrderTrack() throws Exception {
         KingDeeInterface kingDeeInterface = kingDeeInterfaceService.lambdaQuery().eq(KingDeeInterface::getFormId, "ORDER_TRACK").last("limit 1").one();
 
@@ -202,9 +202,9 @@ public class SalesOrderSchedule{
 
 
     /**
-     * 60秒同步工单
+     * 60秒同步工单  嘉贤取消同步
      */
-    @Scheduled(fixedDelay = 200 * 1000)
+   // @Scheduled(fixedDelay = 200 * 1000)
     public void automaticGetSyncCostTicket() throws Exception {
         List<CustomerOrder> list = customerOrderService.lambdaQuery()
                 .isNotNull(CustomerOrder::getGongDanId)

src/main/java/com/zfire/mall/manager/schedule/StockCostSyncSchedule.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 
 
 /**
- * 更新库存
+ * 生成仓储费用
  *
  * @author change
  */

src/main/java/com/zfire/mall/manager/schedule/StockInSchedule.java

@@ -105,6 +105,9 @@ public class StockInSchedule {
     @Autowired
     KingDeeTransferItemService kingDeeTransferItemService;
 
+    @Autowired
+    KingDeeMaterialService kingDeeMaterialService;
+
 
 
     final static String orgId = "1";
@@ -332,6 +335,12 @@ public class StockInSchedule {
             //被弃审的返回数量
             List<KingDeeTransferItem> list = kingDeeTransferItemService.lambdaQuery().eq(KingDeeTransferItem::getFId, object.getId()).list();
             for (KingDeeTransferItem kingDeeTransferItem : list) {
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeeTransferItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 //查出被反审的内容
                 Stock stock = stockService.lambdaQuery().eq(Stock::getStockId, kingDeeTransferItem.getSrcStockId())
                         .eq(Stock::getMaterialId, kingDeeTransferItem.getMaterialId()).last("limit 1").one();
@@ -362,6 +371,11 @@ public class StockInSchedule {
 
         if (CollectionUtil.isNotEmpty(kingDeeTransferItems)) {
             for (KingDeeTransferItem kingDeeTransferItem : kingDeeTransferItems) {
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeeTransferItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
                 KingDeeTransferItem byId = kingDeeTransferItemService.getById(kingDeeTransferItem.getId());
                 // 入库表表中能找到，相减加库存
                 if (byId != null){
@@ -449,11 +463,11 @@ public class StockInSchedule {
 
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.STOCK_TRANSFER, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FStockOrgId.FName,FStockOutOrgId.FName,FTransferBizType,FNote,FApproverId.FName,FCancellerId.FName,FBillTypeID.FName,FDocumentStatus,FDate,FApproveDate,FCancelDate");
+        request.setFieldKeys("FID,FBillNo,FStockOrgId.FName,FStockOutOrgId.FName,FTransferBizType,FNote,FApproverId.FName,FCancellerId.FName,FBillTypeID.FName,FDocumentStatus,FDate,FCancelDate");
         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","fDate","cancelDate","approveDate"};
         List<KingDeeTransfer> objects = k3Logic.allSync(request, fields, KingDeeTransfer.class);
 
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
@@ -526,6 +540,12 @@ public class StockInSchedule {
             //被弃审的返回数量
             List<KingDeeOtherStockOutItem> list = kingDeeOtherStockOutItemService.lambdaQuery().eq(KingDeeOtherStockOutItem::getFId, object.getId()).list();
             for (KingDeeOtherStockOutItem kingDeeOtherStockOutItem : list) {
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeeOtherStockOutItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 //查出被反审的内容
                 Stock stock = stockService.lambdaQuery().eq(Stock::getStockId, kingDeeOtherStockOutItem.getStockId())
                         .eq(Stock::getMaterialId, kingDeeOtherStockOutItem.getMaterialId()).last("limit 1").one();
@@ -558,6 +578,13 @@ public class StockInSchedule {
 
         if (CollectionUtil.isNotEmpty(kingDeePurchaseStockOuts)) {
             for (KingDeeOtherStockOutItem kingDeePurchaseStockOutItem : kingDeePurchaseStockOuts) {
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeePurchaseStockOutItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
+
                 KingDeeOtherStockOutItem byId = kingDeeOtherStockOutItemService.getById(kingDeePurchaseStockOutItem.getId());
                 KingDeeOtherStockOut kingDeeOtherStockOut = kingDeeOtherStockOutService.getById(kingDeePurchaseStockOutItem.getFId());
                 // 入库表表中能找到，相减加库存
@@ -687,13 +714,13 @@ public class StockInSchedule {
         // 调用入库单接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.OTHER_OUT_STOCK, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FApproverId.FName,FApproveDate,FCancelDate," +
+        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FApproverId.FName,FCancelDate," +
                 "FNote,FDocumentStatus,FStockDirect");
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
 
         String[] fields = new String[]{"id","billNo","fDate","stockOrgId","approverId","approveDate","cancelDate",
-                "note","fdDocumentStatus","stockDirect"};
+                "note","fdDocumentStatus","stockDirect","approveDate"};
         request.setNotTime(true);
         List<KingDeeOtherStockOut> objects = k3Logic.allSync(request, fields, KingDeeOtherStockOut.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
@@ -765,6 +792,12 @@ public class StockInSchedule {
             //被弃审的返回数量
             List<KingDeeOtherStockInItem> list = kingDeeOtherStockInItemService.lambdaQuery().eq(KingDeeOtherStockInItem::getFId, object.getId()).list();
             for (KingDeeOtherStockInItem kingDeeOtherStockIn : list) {
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeeOtherStockIn.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 //查出被反审的内容
                 Stock stock = stockService.lambdaQuery().eq(Stock::getStockId, kingDeeOtherStockIn.getStockId())
                         .eq(Stock::getMaterialId, kingDeeOtherStockIn.getMaterialId()).last("limit 1").one();
@@ -801,6 +834,11 @@ public class StockInSchedule {
                 KingDeeOtherStockInItem byId = kingDeeOtherStockInItemService.getById(kingDeeOtherStockInItem.getId());
                 KingDeeOtherStockIn kingDeeOtherStockIn = kingDeeOtherStockInService.getById(kingDeeOtherStockInItem.getFId());
 
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeeOtherStockInItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 // 入库表表中能找到，相减加库存
                 if (byId != null){
 
@@ -992,6 +1030,13 @@ public class StockInSchedule {
         if (CollectionUtil.isNotEmpty(kingDeePurchaseStockOuts)) {
             for (KingDeePurchaseStockOutItem kingDeePurchaseStockOutItem : kingDeePurchaseStockOuts) {
                 KingDeePurchaseStockOutItem byId = kingDeePurchaseStockOutItemService.getById(kingDeePurchaseStockOutItem.getId());
+
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeePurchaseStockOutItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 // 入库表表中能找到，相减加库存
                 if (byId != null){
 
@@ -1160,6 +1205,13 @@ public class StockInSchedule {
             //被弃审的返回数量
             List<KingDeePurchaseStockOutItem> list = kingDeePurchaseStockOutItemService.lambdaQuery().eq(KingDeePurchaseStockOutItem::getFId, object.getId()).list();
             for (KingDeePurchaseStockOutItem kingDeePurchaseStockOutItem : list) {
+
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeePurchaseStockOutItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 //查出被反审的内容
                 Stock stock = stockService.lambdaQuery().eq(Stock::getStockId, kingDeePurchaseStockOutItem.getStockId())
                         .eq(Stock::getMaterialId, kingDeePurchaseStockOutItem.getMaterialId()).last("limit 1").one();
@@ -1215,6 +1267,12 @@ public class StockInSchedule {
             //被弃审的返回数量
             List<KingDeePurchaseStockInItem> list = kingDeePurchaseStockInItemService.lambdaQuery().eq(KingDeePurchaseStockInItem::getFId, object.getId()).list();
             for (KingDeePurchaseStockInItem kingDeePurchaseStockInItem : list) {
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeePurchaseStockInItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 //查出被反审的内容
                 Stock stock = stockService.lambdaQuery().eq(Stock::getStockId, kingDeePurchaseStockInItem.getStockId())
                         .eq(Stock::getMaterialId, kingDeePurchaseStockInItem.getMaterialId()).last("limit 1").one();
@@ -1240,6 +1298,12 @@ public class StockInSchedule {
         if (CollectionUtil.isNotEmpty(kingDeePurchaseStockInItems)) {
             for (KingDeePurchaseStockInItem kingDeePurchaseStockInItem : kingDeePurchaseStockInItems) {
                 KingDeePurchaseStockInItem byId = kingDeePurchaseStockInItemService.getById(kingDeePurchaseStockInItem.getId());
+
+                KingDeeMaterial kingDeeMaterialServiceById = kingDeeMaterialService.getById(kingDeePurchaseStockInItem.getMaterialId());
+                if (kingDeeMaterialServiceById == null){
+                    continue;
+                }
+
                 // 入库表表中能找到，相减加库存
                 if (byId != null){