仓库

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

@@ -80,6 +80,8 @@
             cInvCode
         FROM
             CurrentStock
+        WHERE
+            cWhCode ='02'
         GROUP BY
             cInvCode
     </select>
@@ -126,7 +128,7 @@
     </select>
 
     <select id="getListByOrderSheetNotEnough" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
-        SELECT
+         SELECT
             mm.Qty AS Qtys,
             mm.IssQty as IssQty,
             mo.InvCode,
@@ -138,9 +140,9 @@
           mom_moallocate mm
         LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
         LEFT JOIN mom_order m ON mo.MoId= m.MoId
-        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        LEFT JOIN Inventory i ON mm.InvCode= i.cInvCode
 				where mm.Qty-mm.IssQty>0
-				ORDER BY i.cinvcode
+				ORDER BY m.MoCode
     </select>
 
 
@@ -181,7 +183,8 @@
         LEFT JOIN Department d ON ma.cDepCode= d.cDepCode
         LEFT JOIN Inventory i ON mas.cInvCode= i.cInvCode
         WHERE
-        mas.iQuantity - mas.fOutQuantity >0
+        isnull(mas.iQuantity,0) - isnull(mas.fOutQuantity,0) >0
+        AND mas.cBCloser is NULL
     </select>
 
     <select id="getApplyCompleteSum" resultType="java.lang.Integer">

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

@@ -67,6 +67,7 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         List<FbsMomOrderdetail> fbsMomOrderdetailList=new ArrayList<>();
         if(fbsMomOrderdetailListCurrentStock!=null&&fbsMomOrderdetailListMomMoallocate!=null){
             for(FbsMomOrderdetail momMoallocate:fbsMomOrderdetailListMomMoallocate){
+                boolean ismomMoallocateCode=false;
                 for(FbsMomOrderdetail currentStock:fbsMomOrderdetailListCurrentStock){
                     if(momMoallocate.getCinvcode().equals(currentStock.getCinvcode())){
                         if(type.equals("1")){//备料
@@ -76,9 +77,14 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
                         }else if(type.equals("3")){
                             getMaterialPreparationAndLackOfMaterial(currentStock,momMoallocate,fbsMomOrderdetailList);
                         }
-
+                        ismomMoallocateCode=true;
                     }
                 }
+                //没仓仓库找到
+                if(ismomMoallocateCode==false){
+                    momMoallocate.setShortageQuantity(momMoallocate.getQtys()-momMoallocate.getIssQty());
+                    fbsMomOrderdetailList.add(momMoallocate);
+                }
             }
         }
         return fbsMomOrderdetailList;
@@ -119,19 +125,20 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         }
     }
 
+
     @Override
     public List<FbsMomOrderdetail> getListByOrderSheetNotEnough() {
         List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailMapper.getListByOrderSheetNotEnough();
-        if(fbsMomOrderdetailList!=null){
-            String moCode="";
-            for (FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
-                if(moCode.equals("")||!moCode.equals(fbsMomOrderdetail.getMocode())){
-                    moCode=fbsMomOrderdetail.getMocode();
-                }else{
-                    fbsMomOrderdetail.setMocode("");
-                }
-            }
-        }
+//        if(fbsMomOrderdetailList!=null){
+//            String moCode="";
+//            for (FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+//                if(moCode.equals("")||!moCode.equals(fbsMomOrderdetail.getMocode())){
+//                    moCode=fbsMomOrderdetail.getMocode();
+//                }else{
+//                    fbsMomOrderdetail.setMocode("");
+//                }
+//            }
+//        }
 
         return fbsMomOrderdetailList;
     }