调整

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

@@ -361,4 +361,25 @@ public class FbsMomOrderdetailController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 工单缺料
+	 * @Date 2020/11/5 21:16
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+	 */
+	 @GetMapping(value = "/getListByOrderSheetNotEnough")
+	 public Result<List<FbsMomOrderdetail>> getListByOrderSheetNotEnough(){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getListByOrderSheetNotEnough();
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

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

@@ -426,4 +426,7 @@ public class FbsMomOrderdetail implements Serializable {
 	//缺料数量
 	@TableField(exist = false)
 	private Integer shortageQuantity;
+	//项目名称
+	@TableField(exist = false)
+	private String define12;
 }

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

@@ -86,4 +86,14 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getApplyList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 工单缺料
+    * @Date 2020/11/5 21:08
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+
+    List<FbsMomOrderdetail> getListByOrderSheetNotEnough();
 }

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

@@ -38,7 +38,8 @@
             i.cInvStd,
             i.cInvName,
             mo.Qty,
-            mo.QualifiedInQty
+            mo.QualifiedInQty,
+            m.Define12
         FROM
             mom_orderdetail mo
             LEFT JOIN mom_order m ON mo.MoId= m.MoId
@@ -123,6 +124,24 @@
             SUM( mm.Qty )-SUM(mm.IssQty)>0
     </select>
 
+    <select id="getListByOrderSheetNotEnough" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            mm.Qty AS Qtys,
+            mm.IssQty as IssQty,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname,
+            i.cinvcode,
+            i.cinvstd
+        FROM
+          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
+				where mm.Qty-mm.IssQty>0
+				ORDER BY i.cinvcode
+    </select>
+
 
 
 

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

@@ -75,4 +75,13 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getApplyList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 工单缺料
+    * @Date 2020/11/5 21:08
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheetNotEnough();
 }

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

@@ -89,6 +89,8 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getApplyList();
     }
 
+
+
     //备料
     public void getMaterialPreparation(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
         if(currentStock.getMaterialPreparationTotal()-momMoallocate.getQtys()>0){
@@ -117,4 +119,21 @@ 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("");
+                }
+            }
+        }
+
+        return fbsMomOrderdetailList;
+    }
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsPuArrivalvouchController.java

@@ -453,4 +453,25 @@ public class FbsPuArrivalvouchController {
 
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 品质看板质量异常信息
+	 * @Date 2020/11/5 19:53
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+	 */
+	 @GetMapping(value = "/getQualityUnpassList")
+	 public Result<List<Map<String,Object>>> getQualityUnpassList(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 try {
+			 List<Map<String,Object>> map=fbsPuArrivalvouchService.getQualityUnpassList();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/entity/FbsArrivalVouchs.java

@@ -508,5 +508,9 @@ public class FbsArrivalVouchs implements Serializable {
 	@TableField(exist = false)
 	private Double arriveSum;//数量
 
+	//项目名称
+	@TableField(exist = false)
+	private String cdefine12;
+
 
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/FbsPuArrivalvouchMapper.java

@@ -92,4 +92,13 @@ public interface FbsPuArrivalvouchMapper extends BaseMapper<FbsPuArrivalvouch> {
     * @return java.util.List<org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch>
     */
     List<FbsPuArrivalvouch> getCheckRateByBatchno();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板质量异常信息
+    * @Date 2020/11/5 19:49
+    * @Param []
+    * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String,Object>> getQualityUnpassList();
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsArrivalVouchsMapper.xml

@@ -19,7 +19,8 @@
             d.cInvName materialName,
             a.iQuantity arriveSum,
             d.cInvStd specs,
-            b.cMemo memo
+            b.cMemo memo,
+            b.cDefine12
         FROM
           PO_Podetails a
         LEFT JOIN PO_Pomain b ON a.POID = b.POID

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -61,13 +61,15 @@
         <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                  fValidQuantity - fRealQuantity '已到货未入库数据',b.dportdate '到货日期'-->
         SELECT b.cVenCode cVenCode,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-        a.fValidQuantity - a.fValidInQuan arriveSum,CONVERT(varchar(30),b.dDate ,23) arriveDate
+        a.fRealQuantity arriveSum,CONVERT(varchar(30),b.dDate ,23) arriveDate,a.cItemName cItemName
         FROM
         PU_ArrivalVouchs a
         left join PU_ArrivalVouch b on a.id = b.id
         left join Vendor c on b.cVenCode = c.cVenCode
         left join Inventory d on a.cInvCode = d.cInvCode
-        where  (a.fValidQuantity - a.fValidInQuan) &gt; 0
+        where
+        <!--(a.fValidQuantity - a.fValidInQuan) &gt; 0-->
+        (a.iQuantity - a.fRealQuantity) &gt; 0
         order by b.dportdate desc
 
     </select>
@@ -192,6 +194,48 @@
 
     </select>
 
-
+    <select id="getQualityUnpassList" resultType="java.util.HashMap">
+        SELECT
+            pp.cPOID cPOID,
+            iArrQTY iArrQTY,
+            qq.CPOCODE cpocode,
+            qq.DDATE ddate,
+            qq.CVENCODE cvencode,
+            qq.CINVCODE cinvcode,
+            qq.cInvName cinvName,
+            qq.FCHKQUANTITY fchkquantity,
+            qq.FCHKINVALIDQTY fchkinvalidqty
+        FROM
+            (
+        SELECT
+            pp.cPOID,
+            sum( iArrQTY ) iArrQTY
+        FROM
+            PO_Pomain pp
+            LEFT JOIN PO_Podetails pps ON pp.POID = pps.POID
+        GROUP BY
+            pp.cPOID
+            ) pp
+            LEFT JOIN (
+        SELECT
+            q.CPOCODE,
+            q.DDATE,
+            q.CVENCODE,
+            q.CINVCODE,
+            i.cInvName,
+            sum( qs.FCHKQUANTITY ) FCHKQUANTITY,
+            sum( qs.FCHKINVALIDQTY ) FCHKINVALIDQTY
+        FROM
+            QMCHECKVOUCHER q
+            LEFT JOIN QMCHECKVOUCHERS qs ON qs.ID = q.ID
+            LEFT JOIN Inventory i ON q.CINVCODE = i.cInvCode
+        GROUP BY
+            q.CPOCODE,
+            q.DDATE,
+            q.CVENCODE,
+            q.CINVCODE,
+            i.cInvName
+            ) qq ON pp.cPOID = qq.CPOCODE
+            </select>
 
 </mapper>

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsPuArrivalvouchService.java

@@ -75,4 +75,13 @@ public interface IFbsPuArrivalvouchService extends IService<FbsPuArrivalvouch> {
     * @return java.util.List<org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch>
     */
     Map<String,Object> getCheckRateByBatchno();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板质量异常信息
+    * @Date 2020/11/5 19:50
+    * @Param []
+    * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String,Object>> getQualityUnpassList();
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsPuArrivalvouchServiceImpl.java

@@ -90,4 +90,9 @@ public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchM
         return map;
     }
 
+    @Override
+    public List<Map<String, Object>> getQualityUnpassList() {
+        return fbsPuArrivalvouchMapper.getQualityUnpassList();
+    }
+
 }