仓库看板 sfs

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

@@ -102,6 +102,14 @@ public class FbsWorkingStatisticsController {
 	 private String upVedioABB;
 	 @Value("${jeecg.path.uppersonnel}")
 	 private String upPersonnel;
+	 @Value("${jeecg.path.upvedioCCCA}")
+	 private String upVedioCCCA;
+	 @Value("${jeecg.path.upvedioCCCB}")
+	 private String upVedioCCCB;
+	 @Value("${jeecg.path.upvedioCCCC}")
+	 private String upVedioCCCC;
+	 @Value("${jeecg.path.upvedioCCCD}")
+	 private String upVedioCCCD;
 
 	 public static void main1(String[] srg) {
 		 String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -1099,31 +1107,66 @@ public class FbsWorkingStatisticsController {
 		 Result<List<Map<String,Object>>> result=new Result<>();
 		 ArrayList<String> list = new ArrayList<>();
 		 FileList.getAllFileName(upVedioAAA,list);
-		 if(list == null || list.size() < 1){
-			 FileList.getAllFileName(upVedioABB,list);
-			 result.setAddMes("ABB");
-		 }else{
+//		 if(list == null || list.size() < 1){
+//			 FileList.getAllFileName(upVedioABB,list);
+//			 result.setAddMes("ABB");
+//		 }else{
+//			 result.setAddMes("AAA");
+//		 }
+		 Boolean isList=false;
+		 FileList.getAllFileName(upVedioAAA,list);
+		 if(list != null && list.size() > 0){
 			 result.setAddMes("AAA");
+			 isList=true;
+		 }
+		 FileList.getAllFileName(upVedioABB,list);
+		 if(isList==false){
+			 if(list != null && list.size() > 0) {
+				 result.setAddMes("ABB");
+				 isList = true;
+			 }
 		 }
+
+
+
+
 		 List<Map<String,Object>> resuleMap = new ArrayList<>();
 		 try {
-			 Collections.sort(list); // 升序排列
-			 for (String o:list){
-				 Map<String,Object> map = new HashMap<>();
-				 map.put("fileName",o);
-				 map.put("upVideo",result.getAddMes());
-				 map.put("fileType",getFileOf(o).toLowerCase());
-				 String fileType = getFileOf(o).toLowerCase();
-				 if(fileType.equals("jpg") || fileType.equals("jpeg") || fileType.equals("png")){
-					 map.put("isImg",true);
-				 }else if(fileType.equals("avi") || fileType.equals("mov") || fileType.equals("rmvb") || fileType.equals("rm")
-						 || fileType.equals("flv") || fileType.equals("mp4") || fileType.equals("3gp")){
-					 map.put("isVideo",true);
-				 }else if(fileType.equals("pdf")){
-					 map.put("isPdf",true);
-				 }else{
-				 	continue;
+			 if(isList){
+				 Collections.sort(list); // 升序排列
+				 for (String o:list){
+					 Map<String,Object> map = new HashMap<>();
+					 map.put("fileName",o);
+					 map.put("upVideo",result.getAddMes());
+					 map.put("fileType",getFileOf(o).toLowerCase());
+					 String fileType = getFileOf(o).toLowerCase();
+					 if(fileType.equals("jpg") || fileType.equals("jpeg") || fileType.equals("png")){
+						 map.put("isImg",true);
+					 }else if(fileType.equals("avi") || fileType.equals("mov") || fileType.equals("rmvb") || fileType.equals("rm")
+							 || fileType.equals("flv") || fileType.equals("mp4") || fileType.equals("3gp")){
+						 map.put("isVideo",true);
+					 }else if(fileType.equals("pdf")){
+						 map.put("isPdf",true);
+					 }else{
+						 continue;
+					 }
+					 resuleMap.add(map);
 				 }
+			 }else{
+				 Map<String,Object> map = new HashMap<>();
+				 FileList.getAllFileName(upVedioCCCA,list);
+
+				 getFileList(list,map,"CCCA");
+				 list=new ArrayList<>();
+				 FileList.getAllFileName(upVedioCCCB,list);
+				 getFileList(list,map,"CCCB");
+				 list=new ArrayList<>();
+				 FileList.getAllFileName(upVedioCCCC,list);
+				 getFileList(list,map,"CCCC");
+				 list=new ArrayList<>();
+				 FileList.getAllFileName(upVedioCCCD,list);
+				 getFileList(list,map,"CCCD");
+				 map.put("upVideo","CCC");
 				 resuleMap.add(map);
 			 }
 			 result.setResult(resuleMap);
@@ -1137,6 +1180,31 @@ public class FbsWorkingStatisticsController {
 		 return result;
 	 }
 
+	 public void getFileList(ArrayList<String> list,Map<String,Object> map,String type){
+		 List<Map<String,Object>> mapListA = new ArrayList<>();
+		 if(list!=null&&list.size()>0){
+			 for (String o:list){
+				 Map<String,Object> mapA = new HashMap<>();
+				 mapA.put("fileName",o);
+				 mapA.put("upVideo","CCCC");
+				 mapA.put("fileType",getFileOf(o).toLowerCase());
+				 String fileType = getFileOf(o).toLowerCase();
+				 if(fileType.equals("jpg") || fileType.equals("jpeg") || fileType.equals("png")){
+					 mapA.put("isImg",true);
+				 }else if(fileType.equals("avi") || fileType.equals("mov") || fileType.equals("rmvb") || fileType.equals("rm")
+						 || fileType.equals("flv") || fileType.equals("mp4") || fileType.equals("3gp")){
+					 mapA.put("isVideo",true);
+				 }else if(fileType.equals("pdf")){
+					 mapA.put("isPdf",true);
+				 }else{
+					 continue;
+				 }
+				 mapListA.add(mapA);
+			 }
+		 }
+		 map.put(type,mapListA);
+	 }
+
 	 /**
 	  * 获取仓库人员图片信息
 	  */

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

@@ -529,4 +529,19 @@ public class FbsMomOrderdetailController {
 		 return result;
 	 }
 
+
+	 @GetMapping(value = "/getMoallocateListGroupCount")
+	 public Result<Integer> getMoallocateListGroupCount(){
+		 Result<Integer> result=new Result<>();
+		 try {
+			 Integer a=fbsMomOrderdetailService.getMoallocateListGroupCount();
+			 result.setResult(a);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

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

@@ -479,4 +479,7 @@ public class FbsMomOrderdetail implements Serializable {
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	@TableField(exist = false)
 	private Date dueDate;
+
+	@TableField(exist = false)
+	private Object modQty;
 }

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

@@ -199,6 +199,8 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
      */
     List<FbsMomOrderdetail> getOrderDetailList();
 
+    Integer getMoallocateListGroupCount();
+
     /**
      * @Author chenchuang
      * @Description //TODO 除关闭的生产订单的子件数据包括数量等和库存数量

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

@@ -72,37 +72,38 @@
             MONTH,
             mm.StartDate,
             getdate()) =0-->
-            substring( m.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
-            and mo.Status in ('3','4')
-        ORDER BY
-            m.createtime DESC
-    </select>
-
-
-    <select id="getMonthListStatre" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
-        SELECT
-        m.MoId,
-        m.MoCode,
-        i.cInvCode,
-        i.cInvStd,
-        i.cInvName,
-        i.cInvDefine13,
-        mo.Qty,
-        mo.QualifiedInQty,
-        m.Define12,
-        mm.StartDate,
-        mm.DueDate
-        FROM
-        mom_orderdetail mo
-        LEFT JOIN mom_order m ON mo.MoId= m.MoId
-        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
-        left join mom_morder mm on mo.MoDId=mm.MoDId
-        WHERE
-
-        <!--datediff(
-        MONTH,
-        mm.StartDate,
-        getdate()) =0-->
+        <!-- substring( m.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
+         and mo.Status in ('3','4')-->
+        mo.Status <![CDATA[ <>]]> 4
+     ORDER BY
+         m.createtime DESC
+ </select>
+
+
+ <select id="getMonthListStatre" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+     SELECT
+     m.MoId,
+     m.MoCode,
+     i.cInvCode,
+     i.cInvStd,
+     i.cInvName,
+     i.cInvDefine13,
+     mo.Qty,
+     mo.QualifiedInQty,
+     m.Define12,
+     mm.StartDate,
+     mm.DueDate
+     FROM
+     mom_orderdetail mo
+     LEFT JOIN mom_order m ON mo.MoId= m.MoId
+     LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+     left join mom_morder mm on mo.MoDId=mm.MoDId
+     WHERE
+
+     <!--datediff(
+     MONTH,
+     mm.StartDate,
+     getdate()) =0-->
         mo.Status = 3
         <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
             AND m.MoCode=#{fbsMomOrderdetail.mocode}
@@ -462,7 +463,8 @@
             mo.InvCode,
             m.MoCode,
             i.cinvname,
-            mi.cinvname mcinvname
+            mi.cinvname mcinvname,
+            mo.Qty as modQty
         FROM
           mom_moallocate mm
         LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
@@ -473,11 +475,44 @@
         WHERE
             mo.RelsUser IS NOT NULL
             AND mo.Status  <![CDATA[ <> ]]> 4
+            AND mm.Qty  <![CDATA[ <> ]]> mm.IssQty
             ORDER BY
             m.MoCode,
             mo.InvCode DESC
     </select>
 
+    <select id="getMoallocateListGroupCount" resultType="java.lang.Integer">
+        SELECT COUNT
+        ( * )
+        FROM
+        (
+        SELECT TOP
+        100 PERCENT mo.InvCode,
+        m.MoCode,
+        i.cinvname,
+        mo.Qty
+        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
+        LEFT JOIN Inventory mi ON mm.InvCode= mi.cInvCode
+        LEFT JOIN ( SELECT SUM ( iQuantity ) AS materialPreparationTotal, cInvCode FROM CurrentStock WHERE cWhCode IN ( '02', '10' ) GROUP BY cInvCode ) cs ON mm.InvCode= cs.cInvCode
+        WHERE
+        mo.RelsUser IS NOT NULL
+        AND mo.Status   <![CDATA[ <> ]]> 4
+        AND mm.Qty <![CDATA[ <> ]]> mm.IssQty
+        GROUP BY
+        mo.InvCode,
+        m.MoCode,
+        i.cinvname,
+        mo.Qty
+        ORDER BY
+        m.MoCode,
+        mo.InvCode DESC
+        ) a
+    </select>
+
     <select id="getOrderDetailList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT
             SUM ( mm.Qty ) AS Qtys,

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

@@ -183,4 +183,7 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMoallocateList();
 
+
+    Integer getMoallocateListGroupCount();
+
 }

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

@@ -363,7 +363,72 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
 
     @Override
     public List<FbsMomOrderdetail> getMoallocateList() {
-        return fbsMomOrderdetailMapper.getMoallocateList();
+//        List<FbsMomOrderdetail> orderdetailList=fbsMomOrderdetailMapper.getOrderDetailList();
+        List<FbsMomOrderdetail> momdetailList=fbsMomOrderdetailMapper.getMoallocateList();
+        List<FbsMomOrderdetail> orderAll=new ArrayList<>();
+//        for(FbsMomOrderdetail fbsMomOrderdetail:orderdetailList){
+//            int i=0;
+//            for(FbsMomOrderdetail momdetail:momdetailList){
+//                if(fbsMomOrderdetail.getMocode().equals(momdetail.getMocode())){
+//                    orderAll.add(momdetail);
+//                    i++;
+//                }
+//            }
+//            if(i<18){
+//                i=18-i;
+//            }else{
+//                i=i%18;
+//            }
+//            for(int ii=0;ii<i;ii++){
+//                FbsMomOrderdetail fbsMomOrderdetail1=new FbsMomOrderdetail();
+//                fbsMomOrderdetail1.setMocode(fbsMomOrderdetail.getMocode());
+//                fbsMomOrderdetail1.setInvcode(fbsMomOrderdetail.getInvcode());;
+//                fbsMomOrderdetail1.setCinvname(fbsMomOrderdetail.getCinvname());
+//                orderAll.add(fbsMomOrderdetail1);
+//            }
+//        }
+        String code="";
+        int i=0;
+        for(FbsMomOrderdetail fbsMomOrderdetail:momdetailList){
+            if(code.equals("")){
+                code=fbsMomOrderdetail.getMocode();
+            }
+
+            if(!code.equals(fbsMomOrderdetail.getMocode())){
+                int length=0;
+                if(i<18){
+                    length=18-i;
+                }else{
+                    length=18-(i%18);
+                }
+                for(int ii=0;ii<length;ii++){
+                    FbsMomOrderdetail fbsMomOrderdetail1=new FbsMomOrderdetail();
+                    fbsMomOrderdetail1.setMocode(code);
+                    orderAll.add(fbsMomOrderdetail1);
+                }
+                code=fbsMomOrderdetail.getMocode();
+                i=0;
+            }
+            orderAll.add(fbsMomOrderdetail);
+            i++;
+        }
+        int b=0;
+        for(FbsMomOrderdetail fbsMomOrderdetail:orderAll){
+            if(b==0||b%18==0){
+                fbsMomOrderdetail.setFree1("1");
+            }else{
+                fbsMomOrderdetail.setFree1("0");
+            }
+            b++;
+        }
+
+
+        return orderAll;
+    }
+
+    @Override
+    public Integer getMoallocateListGroupCount() {
+        return fbsMomOrderdetailMapper.getMoallocateListGroupCount();
     }