派工单 异常工时

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.xml

@@ -47,8 +47,16 @@
         WHERE
         del_flag = '0'
         AND date_format(
-        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) as '异常'
-
+        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) as '异常',
+        (
+        SELECT
+        IFNULL(sum( mixed_ingredients ),0) + IFNULL(sum( warehousing ),0) + IFNULL(sum( pack ),0) + IFNULL(sum( warehouse_others ),0)
+        FROM
+        fbs_abnormal_working_hours
+        WHERE
+        del_flag = '0'
+        AND date_format(
+        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) as '仓库'
         FROM
         fbs_workshop_dispatch_list fwdl
         WHERE

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -6,6 +6,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -78,9 +80,21 @@ public class FbsAbnormalWorkingHoursController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<FbsAbnormalWorkingHours>> result = new Result<IPage<FbsAbnormalWorkingHours>>();
+		String start=fbsAbnormalWorkingHours.getStart();
+		String end=fbsAbnormalWorkingHours.getEnd();
+		if(StringUtils.isNotBlank(start)){
+			fbsAbnormalWorkingHours.setStart(null);
+		}
+		if(StringUtils.isNotBlank(end)){
+			fbsAbnormalWorkingHours.setEnd(null);
+		}
 		QueryWrapper<FbsAbnormalWorkingHours> queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHours, req.getParameterMap());
 		queryWrapper.lambda().eq(FbsAbnormalWorkingHours::getDelFlag,"0");
 		queryWrapper.lambda().orderByDesc(FbsAbnormalWorkingHours::getCreateTime);
+		if(StringUtils.isNotBlank(start)&&StringUtils.isNotBlank(end)&&!start.equals("null")&&!end.equals("null")){
+			queryWrapper.ge("DATE_FORMAT(date,'%Y-%m-%d')",start);
+			queryWrapper.le("DATE_FORMAT(date,'%Y-%m-%d')",end);
+		}
 		Page<FbsAbnormalWorkingHours> page = new Page<FbsAbnormalWorkingHours>(pageNo, pageSize);
 		IPage<FbsAbnormalWorkingHours> pageList = fbsAbnormalWorkingHoursService.page(page, queryWrapper);
 		result.setSuccess(true);

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursDescribeController.java

@@ -257,4 +257,24 @@ public class FbsAbnormalWorkingHoursDescribeController {
 		return result;
 	}
 
+	/**
+	* @Author chenchuang
+	* @Description //TODO 明细导出数据
+	* @Date 2020/11/18 16:13
+	* @Param [fbsAbnormalWorkingHoursDescribe]
+	* @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>>
+	*/
+	@GetMapping(value = "/getListAndMain")
+	public Result<List<FbsAbnormalWorkingHoursDescribe>> getListAndMain(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe){
+		Result<List<FbsAbnormalWorkingHoursDescribe>> result=new Result<>();
+		try {
+			List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeList=fbsAbnormalWorkingHoursDescribeService.getListAndMain(fbsAbnormalWorkingHoursDescribe);
+			result.setResult(fbsAbnormalWorkingHoursDescribeList);
+			result.success("操作成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.error500("操作失败："+e.getMessage());
+		}
+		return result;
+	}
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -173,6 +173,14 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	private String typeId;
 	//类型名称
 	private String typeName;
+	//配料
+	private String mixedIngredients;
+	//入库
+	private String warehousing;
+	//打包
+	private String pack;
+	//仓库其他
+	private String warehouseOthers;
 
 	//不良品总数
 	@TableField(exist = false)
@@ -181,4 +189,10 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	//月份
 	@TableField(exist = false)
 	private String months;
+	//开始时间
+	@TableField(exist = false)
+	private String start;
+	//结束时间
+	@TableField(exist = false)
+	private String end;
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHoursDescribe.java

@@ -89,4 +89,10 @@ public class FbsAbnormalWorkingHoursDescribe implements Serializable {
 	//异常分类总数
 	@TableField(exist = false)
 	private String total;
+	//开始时间
+	@TableField(exist = false)
+	private String start;
+	//结束时间
+	@TableField(exist = false)
+	private String end;
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursDescribeMapper.java

@@ -21,4 +21,13 @@ public interface FbsAbnormalWorkingHoursDescribeMapper extends BaseMapper<FbsAbn
     * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>
     */
   List<FbsAbnormalWorkingHoursDescribe>  getMonthExceptionByCategory();
+
+  /**
+  * @Author chenchuang
+  * @Description //TODO 明细导出数据
+  * @Date 2020/11/18 16:05
+  * @Param []
+  * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>
+  */
+  List<FbsAbnormalWorkingHoursDescribe> getListAndMain(@Param("fbsAbnormalWorkingHoursDescribe") FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe);
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursDescribeMapper.xml

@@ -15,4 +15,19 @@
         GROUP BY
             fawhd.type_name
     </select>
+
+    <select id="getListAndMain" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe">
+        SELECT
+            fawhd.*
+        FROM
+            fbs_abnormal_working_hours_describe fawhd
+            LEFT JOIN fbs_abnormal_working_hours fawh ON fawh.id = fawhd.abnormal_working_hours_id
+        WHERE
+            fawh.del_flag = '0'
+            AND fawhd.del_flag = '0'
+            AND DATE_FORMAT( fawh.date, '%Y-%m-%d' ) <![CDATA[ >= ]]> DATE_FORMAT( #{fbsAbnormalWorkingHoursDescribe.start}, '%Y-%m-%d' )
+            AND DATE_FORMAT( fawh.date, '%Y-%m-%d' ) <![CDATA[ <= ]]> DATE_FORMAT( #{fbsAbnormalWorkingHoursDescribe.end}, '%Y-%m-%d' )
+            ORDER BY
+            fawh.date DESC
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursDescribeService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsAbnormalWorkingHours.service;
 import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,4 +21,13 @@ public interface IFbsAbnormalWorkingHoursDescribeService extends IService<FbsAbn
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
     Map<String,Object> getMonthExceptionByCategory();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 明细导出数据
+    * @Date 2020/11/18 16:07
+    * @Param [fbsAbnormalWorkingHoursDescribe]
+    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>
+    */
+    List<FbsAbnormalWorkingHoursDescribe> getListAndMain(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe);
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursDescribeServiceImpl.java

@@ -35,4 +35,9 @@ public class FbsAbnormalWorkingHoursDescribeServiceImpl extends ServiceImpl<FbsA
         }
         return map;
     }
+
+    @Override
+    public List<FbsAbnormalWorkingHoursDescribe> getListAndMain(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe) {
+        return fbsAbnormalWorkingHoursDescribeMapper.getListAndMain(fbsAbnormalWorkingHoursDescribe);
+    }
 }

src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.fbsInventory.mapper.FbsInventoryMapper">
     <select id="getInventoryGetByOrderId" resultType="org.jeecg.modules.fbsInventory.entity.FbsInventory" >
         SELECT
-        i.cInvCode as cinvcode,i.cInvName as cinvname,m.CostItemName,Convert(decimal(18,2),m.Qty) as qty,m.SortSeq as sortSeq
+        i.cInvDefine13,i.cInvCode as cinvcode,i.cInvName as cinvname,m.CostItemName,Convert(decimal(18,2),m.Qty) as qty,m.SortSeq as sortSeq
         FROM
         mom_orderdetail m
         LEFT JOIN Inventory i ON m.InvCode = i.cInvCode

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

@@ -52,6 +52,7 @@
 
     <select id="getMonthList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT
+            m.MoId,
             m.MoCode,
             i.cInvCode,
             i.cInvStd,
@@ -71,6 +72,8 @@
             mm.StartDate,
             getdate()) =0-->
             substring( m.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
+        ORDER BY
+            m.createtime DESC
     </select>
 
     <select id="getMonthListGroupDefine12" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.controller;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.io.IOException;
@@ -67,6 +68,8 @@ public class FbsWorkshopDispatchListController {
 	 @Autowired
 	 IFbsMomOrderdetailService iFbsMomOrderdetailService;
 
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsWorkshopDispatchList
@@ -325,8 +328,12 @@ public class FbsWorkshopDispatchListController {
 	 public Result<List<FbsMomOrder>> getFbsMomOrder(){
 		 Result<List<FbsMomOrder>> result =new Result<>();
 		 try {
-			 List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list();
+		 	 QueryWrapper<FbsMomOrder> fbsMomOrderQueryWrapper=new QueryWrapper<>();
+		 	 fbsMomOrderQueryWrapper.apply("substring( MoCode, 3, 2 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 2 )");
+		 	 fbsMomOrderQueryWrapper.lambda().orderByDesc(FbsMomOrder::getCreatetime);
+			 List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list(fbsMomOrderQueryWrapper);
 			 result.setResult(fbsMomOrderList);
+//			 List<FbsMomOrderdetail> fbsMomOrderdetailList=iFbsMomOrderdetailService.getMonthList();
 			 result.success("操作成功");
 		 } catch (Exception e) {
 			 e.printStackTrace();
@@ -682,4 +689,38 @@ public class FbsWorkshopDispatchListController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 根据订单号和产品查询对应的单据已近派工了多少数量
+	 * @Date 2020/11/18 13:32
+	 * @Param [fbsWorkshopDispatchList]
+	 * @return org.jeecg.common.api.vo.Result<java.lang.String>
+	 */
+	 @GetMapping(value = "/getDispatchNumberByOrderIdProductId")
+	 public Result<String> getDispatchNumberByOrderIdProductId(FbsWorkshopDispatchList fbsWorkshopDispatchList){
+		 Result<String> result=new Result<>();
+
+		 try {
+		 	//根据订单号和产品查询对应的单据已近派工了多少数量
+			 LambdaQueryWrapper<FbsWorkshopDispatchList> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+			 lambdaQueryWrapper.eq(FbsWorkshopDispatchList::getProductionOrderNumberId,fbsWorkshopDispatchList.getProductionOrderNumberId());
+			 lambdaQueryWrapper.eq(FbsWorkshopDispatchList::getProductId,fbsWorkshopDispatchList.getProductId());
+			 lambdaQueryWrapper.eq(FbsWorkshopDispatchList::getDelFlag,'0');
+			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.list(lambdaQueryWrapper);
+			 BigDecimal bigDecimal=new BigDecimal("0.0");
+			 //获取总数量
+			 if(fbsWorkshopDispatchListList!=null&&fbsWorkshopDispatchListList.size()>0){
+                for(FbsWorkshopDispatchList dispatchList:fbsWorkshopDispatchListList){
+                    bigDecimal=bigDecimal.add(dispatchList.getNumberOfTasks());
+                }
+             }
+			 result.setResult(bigDecimal.doubleValue()+"");
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -132,6 +132,11 @@ public class FbsWorkshopDispatchList implements Serializable {
 	//最新完成数量
 	private String latestCompletedQuantity;
 
+	//U8计划数量
+	private BigDecimal plannedQuantity;
+	//U8标准工时
+	private String standardWorkingHoursZ;
+
     //合并行
 	@TableField(exist = false)
     private Integer mergeLines;