调整1235

src/main/java/org/jeecg/modules/fbsInventory/service/impl/FbsInventoryServiceImpl.java

@@ -786,7 +786,7 @@ public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, Fbs
         System.out.println("结束："+end);
 
         //生产订单
-        iFbsMomOrderService.getPullSapMomOrderAll(20220501000000L,20220505240000L);
+        iFbsMomOrderService.getPullSapMomOrderAll(start,end);
     }
 
     @Override

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -116,7 +116,7 @@
         MONTH,
         mm.StartDate,
         getdate()) =0-->
-        mo.Status = 3
+        mo.Status = 3 and ftp.del_flag='0'
         <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
             AND m.MoCode=#{fbsMomOrderdetail.mocode}
         </if>
@@ -173,6 +173,7 @@
      MONTH,
      mm.StartDate,
      getdate()) =0-->
+     ftp.del_flag='0' and
         mo.Status = 3
         <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
             AND m.MoCode=#{fbsMomOrderdetail.mocode}
@@ -247,7 +248,7 @@
                 substring(DATE_FORMAT(m.CreateTime,'%Y%m%d'), 3, 4)=SUBSTRING(DATE_FORMAT(NOW(),'%Y%m%d'), 3, 4 )
     </if>
 )
-AND mo.Status = 4
+AND mo.Status = 4 and ftp.del_flag='0'
 <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
     AND m.MoCode=#{fbsMomOrderdetail.mocode}
 </if>

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderServiceImpl.java

@@ -172,7 +172,7 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                 }
                 fbsMomOrderdetail.put("InvCode", InvCode);//存货编码
                 fbsMomOrderdetail.put("CostItemName", String.valueOf(jsonObject.get("COSTITEMNAME")));//项目名称
-                fbsMomOrderdetail.put("cost_item_code", String.valueOf(jsonObject.get("CostItemCode")));//项目编码
+                fbsMomOrderdetail.put("cost_item_code", String.valueOf(jsonObject.get("COSTITEMCODE")));//项目编码
                 fbsMomOrderdetail.put("Qty", String.valueOf(jsonObject.get("QTY")));//数量
                 fbsMomOrderdetail.put("SortSeq", Integer.parseInt(jsonObject.get("SORTSEQ").toString()));//行号
                 fbsMomOrderdetail.put("QualifiedInQty", jsonObject.get("QUALIFIEDINQTY"));//入库数量