仓库看板

.idea/FBS_MES.iml

@@ -25,6 +25,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
@@ -53,7 +54,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.3.RELEASE" level="project" />
@@ -203,5 +203,9 @@
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
   </component>
 </module>

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -355,21 +355,24 @@ public class FbsWorkingStatisticsController {
 		 entity.setEndDate(workshopDispatchList.getPlannedStartTime());//计划时间
 		 entity.setFinalTime(entity.getCutTime());//获取当前时间
 		 entity.setFinalInfo("下岗/暂停");
-		 ///////////遇到多人的订单判断是否只有一个属于上岗的情况
-		 QueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsQueryWrapper=new QueryWrapper<>();
-		 fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getDelFlag,"0");
-		 fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getPkWorkshopDispatchList,workshopDispatchList.getId());
-		 fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getFinalState,"1");
-		 List<FbsWorkingStatistics> fbsWorkingStatisticsList=fbsWorkingStatisticsService.list(fbsWorkingStatisticsQueryWrapper);
-		 //只有一个则订单下岗 如果存在多个则状态不变
-		 if(fbsWorkingStatisticsList!=null&&fbsWorkingStatisticsList.size()==1){
-			 entity.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
-		 }
+
+         entity.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+
 
 		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 		 entity.setId(list2.get(0).getId());
 		 fbsWorkingStatisticsService.updateById(entity);
-         fbsWorkshopDispatchListService.updateState("2",entity.getPkWorkshopDispatchList());
+         ///////////遇到多人的订单判断是否只有一个属于上岗的情况
+         QueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsQueryWrapper=new QueryWrapper<>();
+         fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getDelFlag,"0");
+         fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getPkWorkshopDispatchList,workshopDispatchList.getId());
+         fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getFinalState,"1");
+         List<FbsWorkingStatistics> fbsWorkingStatisticsList=fbsWorkingStatisticsService.list(fbsWorkingStatisticsQueryWrapper);
+         //只有一个则订单下岗 如果存在多个则状态不变
+         if(fbsWorkingStatisticsList!=null&&fbsWorkingStatisticsList.size()==1){
+             fbsWorkshopDispatchListService.updateState("2",entity.getPkWorkshopDispatchList());
+         }
+
 
 		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("pk_Workshop_Dispatch_List", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -460,12 +460,25 @@ public class FbsMomOrderdetailController {
 	 * @Param [type]
 	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
 	 */
+//	 @GetMapping(value = "/getListByOrderSheetNow")
+//	 public Result<List<FbsMomOrderdetail>> getListByOrderSheetNow(String type){
+//		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+//		 try {
+//			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getListByOrderSheetNow(type);
+//			 result.setResult(fbsMomOrderdetailList);
+//			 result.success("操作成功");
+//		 } catch (Exception e) {
+//			 e.printStackTrace();
+//			 result.error500("操作失败："+e.getMessage());
+//		 }
+//		 return result;
+//	 }
 	 @GetMapping(value = "/getListByOrderSheetNow")
-	 public Result<List<FbsMomOrderdetail>> getListByOrderSheetNow(String type){
-		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+	 public Result<Map<String,Object>> getListByOrderSheetNow(String type){
+		 Result<Map<String,Object>> result=new Result<>();
 		 try {
-			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getListByOrderSheetNow(type);
-			 result.setResult(fbsMomOrderdetailList);
+			 Map<String,Object> map=fbsMomOrderdetailService.getListByOrderSheetNow(type);
+			 result.setResult(map);
 			 result.success("操作成功");
 		 } catch (Exception e) {
 			 e.printStackTrace();

src/main/java/org/jeecg/modules/fbsMomOrder/entity/Cache.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+/**
+ * 功能描述：
+ *
+ * @Author: chenchuang
+ * @Date: 2021/2/26 13:19
+ */
+public class Cache {
+    private String key;//缓存ID
+    private Object value;//缓存数据
+    private long timeOut;//更新时间
+    private boolean expired; //是否终止
+    public Cache() {
+        super();
+        setTimeOut(System.currentTimeMillis() + 1000 * 60 * 60 * 24);
+        setExpired(false);
+    }
+
+    public Cache(String key, Object value, long timeOut, boolean expired) {
+        this.key = key;
+        this.value = value;
+        this.timeOut = timeOut;
+        this.expired = expired;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public long getTimeOut() {
+        return timeOut;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setKey(String string) {
+        key = string;
+    }
+
+    public void setTimeOut(long l) {
+        timeOut = l;
+    }
+
+    public void setValue(Object object) {
+        value = object;
+    }
+
+    public boolean isExpired() {
+        return expired;
+    }
+
+    public void setExpired(boolean b) {
+        expired = b;
+    }
+}

src/main/java/org/jeecg/modules/fbsMomOrder/entity/CacheManager.java

@@ -0,0 +1,212 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+/**
+ * 功能描述：
+ *
+ * @Author: chenchuang
+ * @Date: 2021/2/26 13:19
+ */
+public class CacheManager {
+    //key唯一名称
+    public  static final String strFormDict = "formDictformMain";
+
+    /************************************************后台 缓存 ********************************************************/
+    public  static final  String findAllEstate="findAllEstate";
+
+    /************************************************后台 缓存  end********************************************************/
+
+
+    private static HashMap cacheMap = new HashMap();
+
+    //单实例构造方法
+    private CacheManager() {
+        super();
+    }
+    //获取布尔值的缓存
+    public static boolean getSimpleFlag(String key){
+        try{
+            return (Boolean) cacheMap.get(key);
+        }catch(NullPointerException e){
+        }
+        return false;
+    }
+    public static long getServerStartdt(String key){
+        try {
+            return (Long)cacheMap.get(key);
+        } catch (Exception ex) {
+            return 0;
+        }
+    }
+    //设置布尔值的缓存
+    public synchronized static boolean setSimpleFlag(String key,boolean flag){
+        if (flag && getSimpleFlag(key)) {//假如为真不允许被覆盖
+            return false;
+        }else{
+            cacheMap.put(key, flag);
+            return true;
+        }
+    }
+    public synchronized static boolean setSimpleFlag(String key,long serverbegrundt){
+        if (cacheMap.get(key) == null) {
+            cacheMap.put(key,serverbegrundt);
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+
+    //得到缓存。同步静态方法
+    private synchronized static Cache getCache(String key) {
+        return (Cache) cacheMap.get(key);
+    }
+
+    //判断是否存在一个缓存
+    private synchronized static boolean hasCache(String key) {
+        return cacheMap.containsKey(key);
+    }
+
+    //清除所有缓存
+    public synchronized static void clearAll() {
+        cacheMap.clear();
+    }
+
+    //清除某类一特定缓存,通过遍历HASHMAP下的所有对象，来判断它的KEY与传入的TYPE是否匹配
+    public synchronized static void clearAll(String type) {
+        Iterator i = cacheMap.entrySet().iterator();
+        String key;
+        ArrayList<String> arr = new ArrayList<String>();
+        try {
+            while (i.hasNext()) {
+                java.util.Map.Entry entry = (java.util.Map.Entry) i.next();
+                key = (String) entry.getKey();
+                if (key.startsWith(type)) { //如果匹配则删除掉
+                    arr.add(key);
+                }
+            }
+            for (int k = 0; k < arr.size(); k++) {
+                clearOnly(arr.get(k));
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    //清除指定的缓存
+    public synchronized static void clearOnly(String key) {
+        cacheMap.remove(key);
+    }
+
+    //载入缓存
+    public synchronized static void putCache(String key, Cache obj) {
+        cacheMap.put(key, obj);
+    }
+
+    //获取缓存信息
+    public static Cache getCacheInfo(String key) {
+
+        if (hasCache(key)) {
+            Cache cache = getCache(key);
+            if (cacheExpired(cache)) { //调用判断是否终止方法
+                cache.setExpired(true);
+                clearOnly(key);
+            }
+            return cache;
+        }else
+            return null;
+    }
+
+    //载入缓存信息
+    public static void putCacheInfo(String key, Cache obj, long dt,boolean expired) {
+        Cache cache = new Cache();
+        cache.setKey(key);
+        cache.setTimeOut(dt + System.currentTimeMillis()); //设置多久后更新缓存
+        cache.setValue(obj);
+        cache.setExpired(expired); //缓存默认载入时，终止状态为FALSE
+        cacheMap.put(key, cache);
+    }
+    //重写载入缓存信息方法
+    public static void putCacheInfo(String key,Cache obj,long dt){
+        Cache cache = new Cache();
+        cache.setKey(key);
+        cache.setTimeOut(dt+System.currentTimeMillis());
+        cache.setValue(obj);
+        cache.setExpired(false);
+        cacheMap.put(key,cache);
+    }
+
+    //判断缓存是否终止
+    public static boolean cacheExpired(Cache cache) {
+        if (null == cache) { //传入的缓存不存在
+            return false;
+        }
+        long nowDt = System.currentTimeMillis(); //系统当前的毫秒数
+        long cacheDt = cache.getTimeOut(); //缓存内的过期毫秒数
+        if (cacheDt <= 0||cacheDt>nowDt) { //过期时间小于等于零时,或者过期时间大于当前时间时，则为FALSE
+            return false;
+        } else { //大于过期时间 即过期
+            return true;
+        }
+    }
+
+    //获取缓存中的大小
+    public static int getCacheSize() {
+        return cacheMap.size();
+    }
+
+    //获取指定的类型的大小
+    public static int getCacheSize(String type) {
+        int k = 0;
+        Iterator i = cacheMap.entrySet().iterator();
+        String key;
+        try {
+            while (i.hasNext()) {
+                java.util.Map.Entry entry = (java.util.Map.Entry) i.next();
+                key = (String) entry.getKey();
+                if (key.indexOf(type) != -1) { //如果匹配则删除掉
+                    k++;
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+        return k;
+    }
+
+    //获取缓存对象中的所有键值名称
+    public static ArrayList<String> getCacheAllkey() {
+        ArrayList a = new ArrayList();
+        try {
+            Iterator i = cacheMap.entrySet().iterator();
+            while (i.hasNext()) {
+                java.util.Map.Entry entry = (java.util.Map.Entry) i.next();
+                a.add((String) entry.getKey());
+            }
+        } catch (Exception ex) {} finally {
+            return a;
+        }
+    }
+
+    //获取缓存对象中指定类型 的键值名称
+    public static ArrayList<String> getCacheListkey(String type) {
+        ArrayList a = new ArrayList();
+        String key;
+        try {
+            Iterator i = cacheMap.entrySet().iterator();
+            while (i.hasNext()) {
+                java.util.Map.Entry entry = (java.util.Map.Entry) i.next();
+                key = (String) entry.getKey();
+                if (key.indexOf(type) != -1) {
+                    a.add(key);
+                }
+            }
+        } catch (Exception ex) {} finally {
+            return a;
+        }
+    }
+}

src/main/java/org/jeecg/modules/fbsMomOrder/entity/CacheManagerImpl.java

@@ -0,0 +1,64 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 功能描述：
+ *
+ * @Author: chenchuang
+ * @Date: 2021/2/26 13:13
+ */
+public class CacheManagerImpl implements ICacheManager {
+    private static Map<String, EntityCache> caches = new ConcurrentHashMap<>();
+    @Override
+    public void putCache(String key, EntityCache cache) {
+        caches.put(key, cache);
+    }
+
+    @Override
+    public void putCache(String key, Object datas, long timeOut) {
+
+    }
+
+    @Override
+    public EntityCache getCacheByKey(String key) {
+        return null;
+    }
+
+    @Override
+    public Object getCacheDataByKey(String key) {
+        return null;
+    }
+
+    @Override
+    public Map<String, EntityCache> getCacheAll() {
+        return null;
+    }
+
+    @Override
+    public boolean isContains(String key) {
+        return false;
+    }
+
+    @Override
+    public void clearAll() {
+
+    }
+
+    @Override
+    public void clearByKey(String key) {
+
+    }
+
+    @Override
+    public boolean isTimeOut(String key) {
+        return false;
+    }
+
+    @Override
+    public Set<String> getAllKeys() {
+        return null;
+    }
+}

src/main/java/org/jeecg/modules/fbsMomOrder/entity/EntityCache.java

@@ -0,0 +1,39 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+/**
+ * 功能描述：
+ *
+ * @Author: chenchuang
+ * @Date: 2021/2/26 13:05
+ */
+public class EntityCache {
+    /**　　* 保存的数据　　*/
+    private Object datas;
+    /**　　* 设置数据失效时间,为0表示永不失效　　*/
+    private long timeOut;
+    /**　　* 最后刷新时间　　*/
+    private long lastRefeshTime;
+    public EntityCache(Object datas, long timeOut, long lastRefeshTime) {
+        this.datas = datas;
+        this.timeOut = timeOut;
+        this.lastRefeshTime = lastRefeshTime;
+    }
+    public Object getDatas() {
+        return datas;
+    }
+    public void setDatas(Object datas) {
+        this.datas = datas;
+    }
+    public long getTimeOut() {
+        return timeOut;
+    }
+    public void setTimeOut(long timeOut) {
+        this.timeOut = timeOut;
+    }
+    public long getLastRefeshTime() {
+        return lastRefeshTime;
+    }
+    public void setLastRefeshTime(long lastRefeshTime) {
+        this.lastRefeshTime = lastRefeshTime;
+    }
+}

src/main/java/org/jeecg/modules/fbsMomOrder/entity/ICacheManager.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 功能描述：
+ *
+ * @Author: chenchuang
+ * @Date: 2021/2/26 13:08
+ */
+public interface ICacheManager {
+    /**　　* 存入缓存　　* @param key　　* @param cache　　*/
+    void putCache(String key, EntityCache cache);
+    /**　　* 存入缓存　　* @param key　　* @param cache　　*/
+    void putCache(String key, Object datas, long timeOut);
+    /**　　* 获取对应缓存　　* @param key　　* @return　　*/
+    EntityCache getCacheByKey(String key);/*** 获取对应缓存* @param key　　* @return　　*/
+    Object getCacheDataByKey(String key);/**　　* 获取所有缓存　　* @param key　　* @return　　*/
+    Map<String, EntityCache> getCacheAll();/**　　* 判断是否在缓存中　　* @param key　　* @return　　*/
+    boolean isContains(String key);
+    /**　　* 清除所有缓存　　*/
+    void clearAll();
+    /**　　* 清除对应缓存　　* @param key　　*/
+    void clearByKey(String key);
+    /**　　* 缓存是否超时失效　　* @param key　　* @return　　*/
+    boolean isTimeOut(String key);
+    /**　　* 获取所有key　　* @return　　*/
+    Set<String> getAllKeys();
+}

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -145,7 +145,7 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
-    List<FbsMomOrderdetail> getListByOrderSheetNow(String type);
+    Map<String,Object> getListByOrderSheetNow(String type);
 
     /**
     * @Author chenchuang

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.fbsMomOrder.service.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import io.swagger.models.auth.In;
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.fbsMomOrder.entity.Cache;
+import org.jeecg.modules.fbsMomOrder.entity.CacheManager;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderdetailMapper;
 import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
@@ -12,10 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 生产订单子表
@@ -141,15 +140,32 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
     }
 
     @Override
-    public List<FbsMomOrderdetail> getListByOrderSheetNow(String type) {
+    public Map<String,Object> getListByOrderSheetNow(String type) {
+        Map<String,Object> map=new LinkedHashMap<>();
         //保存子件
         List<FbsMomOrderdetail> fbsMomOrderdetailListAdd=new ArrayList<>();
         //保存子子件
         List<FbsMomOrderdetail> fbsMomOrderdetailListChildAdd=new ArrayList<>();
         //订单子子件明细
-        List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailMapper.getMomMoallocate();
+        List<FbsMomOrderdetail> fbsMomOrderdetailList=new ArrayList<>();
+        String key=CacheManager.findAllEstate;
+        Cache cache= CacheManager.getCacheInfo(key);
+        if (null == cache){
+            fbsMomOrderdetailList=fbsMomOrderdetailMapper.getMomMoallocate();
+            cache = new Cache();
+            cache.setKey(key);
+            cache.setValue(fbsMomOrderdetailList);
+            CacheManager.putCache(key, cache);
+
+
+        }else {
+            fbsMomOrderdetailList=(List<FbsMomOrderdetail>) cache.getValue();
+        }
+
+
         //现存量
         List<FbsMomOrderdetail> currentStockList=fbsMomOrderdetailMapper.getListByOrderSheetCurrentStock();
+
         if(fbsMomOrderdetailList!=null&&fbsMomOrderdetailList.size()>0){
             Integer qtysTotal=0;//数量总计
             Integer issQtyTotal=0;//已领总计
@@ -206,9 +222,6 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
                 if(fbsMomOrderdetail.getShortageQuantity()==null){
                     fbsMomOrderdetail.setShortageQuantity(qtys-issQty);
                 }
-                System.out.println(qtys);
-                System.out.println(issQty);
-                System.out.println(fbsMomOrderdetail.getShortageQuantity());
 
                 shortageQuantityTotal=shortageQuantityTotal+fbsMomOrderdetail.getShortageQuantity();
                 //获取缺料明细
@@ -224,22 +237,34 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
             fbsMomOrderdetailListAdd.add(fbsMomOrderdetailAdd);
         }
 
-        if(type.equals("1")){//缺料齐套
-            return fbsMomOrderdetailListAdd;
-        }else if(type.equals("2")){//齐套
-            List<FbsMomOrderdetail> fbsMomOrderdetailListQitao=new ArrayList<>();
-            for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailListAdd){
-                if(fbsMomOrderdetail.getShortageQuantity()!=null&&fbsMomOrderdetail.getShortageQuantity()<=0){
-                    fbsMomOrderdetailListQitao.add(fbsMomOrderdetail);
-                }
+//        if(type.equals("1")){//缺料齐套
+//            return fbsMomOrderdetailListAdd;
+//        }else if(type.equals("2")){//齐套
+//            List<FbsMomOrderdetail> fbsMomOrderdetailListQitao=new ArrayList<>();
+//            for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailListAdd){
+//                if(fbsMomOrderdetail.getShortageQuantity()!=null&&fbsMomOrderdetail.getShortageQuantity()<=0){
+//                    fbsMomOrderdetailListQitao.add(fbsMomOrderdetail);
+//                }
+//            }
+//            return fbsMomOrderdetailListQitao;
+//        }else if(type.equals("3")){//缺料明细
+//            return fbsMomOrderdetailListChildAdd;
+//        }else {
+//            return new ArrayList<>();
+//        }
+        //备料
+        map.put("1",fbsMomOrderdetailListAdd);
+        //齐套
+        List<FbsMomOrderdetail> fbsMomOrderdetailListQitao=new ArrayList<>();
+        for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailListAdd){
+            if(fbsMomOrderdetail.getShortageQuantity()!=null&&fbsMomOrderdetail.getShortageQuantity()<=0){
+                fbsMomOrderdetailListQitao.add(fbsMomOrderdetail);
             }
-            return fbsMomOrderdetailListQitao;
-        }else if(type.equals("3")){//缺料明细
-            return fbsMomOrderdetailListChildAdd;
-        }else {
-            return new ArrayList<>();
         }
-
+        map.put("2",fbsMomOrderdetailListQitao);
+        //缺料
+        map.put("3",fbsMomOrderdetailListChildAdd);
+        return map;
     }
     public BigDecimal getDecimalNew(String d){
         BigDecimal decimal= new BigDecimal(d);

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -564,7 +564,10 @@ public class FbsWorkshopDispatchListController {
 
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getSumDispatch(fbsMomOrderdetailList,fbsWorkshopDispatchList);
 			 //获取是否缺料状态
-			 getIsLackOfMaterial(fbsWorkshopDispatchListList);
+			 if(StringUtils.isEmpty(fbsWorkshopDispatchList.getDef1())){
+				 getIsLackOfMaterial(fbsWorkshopDispatchListList);
+			 }
+
 			 result.setResult(fbsWorkshopDispatchListList);
 			 result.success("操作成功");
 		 } catch (Exception e) {