调整

src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsTechnologicalProcessController.java

@@ -78,6 +78,7 @@ public class FbsTechnologicalProcessController {
 		if(StringUtils.isNotBlank(cInvCName)){
 			queryWrapper.like("i.cInvCName",cInvCName);
 		}
+		queryWrapper.and(i->i.ne("ftp.def1","无物料").or().isNull("ftp.def1"));
 		Page<FbsTechnologicalProcess> page = new Page<FbsTechnologicalProcess>(pageNo, pageSize);
 //		IPage<FbsTechnologicalProcess> pageList = fbsTechnologicalProcessService.page(page, queryWrapper);
 		IPage<FbsTechnologicalProcess> pageList = fbsTechnologicalProcessService.findByPage(page, queryWrapper);

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(start,end);
+        iFbsMomOrderService.getPullSapMomOrderAll(20220501000000L,20220505240000L);
     }
 
     @Override

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

@@ -151,8 +151,10 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                 fbsMomOrderdetail.put("MoDId", String.valueOf(jsonObject.get("MOID")));//生产订单明细id（SAP生产订单号）
                 fbsMomOrderdetail.put("MoId", String.valueOf(jsonObject.get("MOID")));//生产订单id（SAP生产订单号）
                 String InvCode = String.valueOf(jsonObject.get("INVCODE"));//存货编码
+                boolean isWU=false;
                 //判断是否无物料
                 if (InvCode == null || InvCode.equals("")) {//无物料则生成物料
+                    isWU=true;
                     SimpleDateFormat df = new SimpleDateFormat("yyMMdd");//设置日期格式
                     String InvCodeNew = df.format(new Date())+((int)((Math.random()*9+1)*100));//时间+三位随机数
                     fbsMomOrderdetail.put("InvCode", InvCodeNew);//存货编码
@@ -280,15 +282,25 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                     String invcode = InvCode+"";
                     //获取工艺主数据名称
                     String nameMain = String.valueOf(jsonObject.getJSONArray("PROCS").getJSONObject(0).get("OPERATIONDESCRIBE"));
+                    String def1="";
+                    if(isWU){
+                        def1="无物料";
+                    }
                     //判断是否存在工艺
                     QueryWrapper<FbsTechnologicalProcess> fbsTechnologicalProcessQueryWrapper = new QueryWrapper<>();
                     fbsTechnologicalProcessQueryWrapper.lambda().eq(FbsTechnologicalProcess::getName, invcode);
-                    List<FbsTechnologicalProcess> fbsTechnologicalProcessList = iFbsTechnologicalProcessService.list(fbsTechnologicalProcessQueryWrapper);
+//                    List<FbsTechnologicalProcess> fbsTechnologicalProcessList = iFbsTechnologicalProcessService.list(fbsTechnologicalProcessQueryWrapper);
                     //不存在则添加新工艺
-                    if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
+//                    if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
+                        //先把旧的工艺进行删除
+                        FbsTechnologicalProcess fbsTechnologicalProcessUpdate=new FbsTechnologicalProcess();
+                        fbsTechnologicalProcessUpdate.setDelFlag("1");
+                        iFbsTechnologicalProcessService.update(fbsTechnologicalProcessUpdate,fbsTechnologicalProcessQueryWrapper);
+
                         FbsTechnologicalProcess fbsTechnologicalProcess = new FbsTechnologicalProcess();
                         fbsTechnologicalProcess.setName(invcode);
                         fbsTechnologicalProcess.setMemo(nameMain);//备注中存工艺主名称
+                        fbsTechnologicalProcess.setDef1(def1);//
                         fbsTechnologicalProcess.setCreateBy("adminSAP");
                         fbsTechnologicalProcess.setPullDate(end + "");
                         iFbsTechnologicalProcessService.save(fbsTechnologicalProcess);//插入数据库
@@ -300,12 +312,21 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                             fbsTechnologicalProcessItem.setMemo(String.valueOf(PROCS.getJSONObject(i).get("OPERATIONNUMBER")));//工艺编码
                             fbsTechnologicalProcessItem.setName(String.valueOf(PROCS.getJSONObject(i).get("DESCRIBE")));//工艺明细名称
                             fbsTechnologicalProcessItem.setCreateBy("adminSAP");
-                            fbsTechnologicalProcessItem.setStandardWorkingHours(getDecimalNew(String.valueOf(PROCS.getJSONObject(i).get("DESCRIBE"))));//标准工时
+                            //将sap的分钟转化成小时
+                            int liveTimeTotle =0;
+                            double decimal=0.0;
+                            if(PROCS.getJSONObject(i).get("STANDARDWORKINGHOURS")!=null){
+                                liveTimeTotle=getDecimalNew(PROCS.getJSONObject(i).get("STANDARDWORKINGHOURS")+"").intValue();
+                                int hours = (int) Math.floor(liveTimeTotle / 60);
+                                int minute = liveTimeTotle % 60;
+                                decimal = Double.parseDouble(String.valueOf(hours).concat(".").concat(String.valueOf(minute)));
+                            }
+                            fbsTechnologicalProcessItem.setStandardWorkingHours(getDecimalNew(String.valueOf(decimal)));//标准工时
                             fbsTechnologicalProcessItem.setSort(i);//排序
                             fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
                         }
                         iFbsTechnologicalProcessItemService.saveBatch(fbsTechnologicalProcessItemList);//插入数据库
-                    }
+//                    }
                 }
             }
             }