bug-修改

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -206,7 +206,7 @@ public class BizDayworkItemController extends BaseController {
                 }
             }
             // 设置上一工段,周转用
-            List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("process_step_number", item.getProcessStepNumber()).list();
+            List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("lot_id",item.getLotId()).eq("process_step_number", item.getProcessStepNumber()).list();
             for (int i = 0; i < dayworkItemList.size(); i++) {
                 if (dayworkItemList.get(i).getDeptName() != null && !"".equals(dayworkItemList.get(i).getDeptName())) {
                     item.setPreDeptName(dayworkItemList.get(i).getDeptName());
@@ -301,9 +301,8 @@ public class BizDayworkItemController extends BaseController {
                     }
                 }
             }
-
             // 设置上一工段,周转用
-            List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("lot_id",item.getLotId()).eq("process_id", item.getProcessId()).list();
+            List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("lot_id", item.getLotId()).eq("process_id", item.getProcessId()).list();
             for (int i = 0; i < dayworkItemList.size(); i++) {
                 if (dayworkItemList.get(i).getDeptName() != null && !"".equals(dayworkItemList.get(i).getDeptName())) {
                     item.setPreDeptName(dayworkItemList.get(i).getDeptName());
@@ -368,7 +367,7 @@ public class BizDayworkItemController extends BaseController {
             dayworkItemByCarrier.setNextProcess(byId);
 
             // 设置上一工段,周转用
-            List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("process_id", dayworkItemByCarrier.getProcessId()).list();
+            List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("lot_id", dayworkItemByCarrier.getLotId()).eq("process_id", dayworkItemByCarrier.getProcessId()).list();
             for (int i = 0; i < dayworkItemList.size(); i++) {
                 if (dayworkItemList.get(i).getDeptName() != null && !"".equals(dayworkItemList.get(i).getDeptName())) {
                     dayworkItemByCarrier.setPreDeptName(dayworkItemList.get(i).getDeptName());
@@ -899,8 +898,6 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setStatus(bizDayworkItem.getStatus());
                 if (bizDayworkItem.getStatus().equals("7")||bizDayworkItem.getStatus().equals("4")) {
                     v.setDeptId(bizDayworkItem.getDeptId());
-                    int sum = bizDayworkItemList.stream().filter(l -> l.getProcessStepNumber().equals(bizDayworkItem.getProcessStepNumber())).mapToInt(BizDayworkItem::getQualifiedNum).sum();
-                    v.setTemporaryProcessQualifiedNum(sum);
                     v.setProcessQualifiedNum(v.getTemporaryProcessQualifiedNum());
                     bizDayworkService.updateById(v);
                 }

src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -81,12 +81,18 @@ public class BizProcessInspecionController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('business:inspecion:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
-        if (bizProcessInspecion.getStartTime() != null) {
+
+        if(bizProcessInspecion.getStartTime()!=null) {
             Date startTimeDate = bizProcessInspecion.getStartTime();
             // 使用 SimpleDateFormat 格式化 Date 对象为特定格式的字符串
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-            bizProcessInspecion.setTimeString("'"+dateFormat.format(startTimeDate)+"'");
+            String time= dateFormat.format(startTimeDate);
+
+            bizProcessInspecion.setStartTimeString(time+ " 00:00:00");
+            bizProcessInspecion.setEndTimeString(time+ " 23:59:59");
         }
+
+
         List<BizProcessInspecion> list = bizProcessInspecionService.getList(bizProcessInspecion);
         return getDataTable(list);
     }
@@ -97,11 +103,14 @@ public class BizProcessInspecionController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('business:inspecion:list')")
     @PostMapping("/outsourcedlist")
     public TableDataInfo outsourcedlist(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
-        if (bizProcessInspecion.getStartTime() != null) {
+        if(bizProcessInspecion.getStartTime()!=null) {
             Date startTimeDate = bizProcessInspecion.getStartTime();
             // 使用 SimpleDateFormat 格式化 Date 对象为特定格式的字符串
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-            bizProcessInspecion.setTimeString(dateFormat.format(startTimeDate));
+            String time= dateFormat.format(startTimeDate);
+
+            bizProcessInspecion.setStartTimeString(time+ " 00:00:00");
+            bizProcessInspecion.setEndTimeString(time+ " 23:59:59");
         }
         List<BizProcessInspecion> list = bizProcessInspecionService.getOutsourcedlist(bizProcessInspecion);
         return getDataTable(list);

src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

@@ -388,6 +388,7 @@ public class BizQuickDayworkController extends BaseController {
             bizDayworkItem.setIsQuick(1);
             bizDayworkItem.setStatus("1");
             bizDayworkItem.setProdNum(l.getProdNum());
+            bizDayworkItem.setDeptName(l.getDeptName());
             bizDayworkItem.setId(snowflakeIdWorker.nextId());
             BizQuickDayworkNextInfo quickInfo = new BizQuickDayworkNextInfo();
             quickInfo.setDayworkItemId(bizDayworkItem.getId());

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -159,7 +159,7 @@ public class SortDayworkController extends BaseController {
         if (bizDaywork.getIsAmend().equals(1) || bizDaywork.getIsWasteRecycling().equals(1)) {
 //            List<BizLotTechnologicalProcess> processes = bizLotTechnologicalProcessService.query().eq("lot_id", bizDaywork.getLotId()).list();
 //            List<BizLotTechnologicalProcessDetail> bizLotTechnologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", processes.stream().map(BizLotTechnologicalProcess::getId).collect(Collectors.toList())).list();
-            List<BizLotTechnologicalProcessDetail> bizLotTechnologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", bizDayworkItem.getTechnologicalProcessId()).list();
+            List<BizLotTechnologicalProcessDetail> bizLotTechnologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", item.getTechnologicalProcessId()).list();
 //            returnCarrier = bizLotTechnologicalProcessDetails.stream().max(Comparator.comparing(BizLotTechnologicalProcessDetail::getProcessStepNumber)).orElse(new BizLotTechnologicalProcessDetail()).getProcessStepNumber().equals(item.getProcessStepNumber());
             returnCarrier = item.getProcessStepNumber().equals(bizLotTechnologicalProcessDetails.stream().filter(v -> !v.getTenantId().equals(9L)).max(Comparator.comparing(BizLotTechnologicalProcessDetail::getProcessStepNumber)).orElse(new BizLotTechnologicalProcessDetail()).getProcessStepNumber());
 //                    item.getProcessStepNumber().equals(bizLotTechnologicalProcessDetails.stream().max(Comparator.comparing(BizLotTechnologicalProcessDetail::getProcessStepNumber)));

src/main/java/cn/ezhizao/project/business/product/domain/BizProcessInspecion.java

@@ -113,7 +113,11 @@ public class BizProcessInspecion extends BaseEntity
     private Date startTime;
 
     @TableField(exist = false)
-    private String timeString;
+    private String startTimeString;
+
+    @TableField(exist = false)
+    private String endTimeString;
+
     /** 结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")

src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java

@@ -43,6 +43,7 @@ public class BizWorkshopController extends BaseController {
         SysDept dept = iSysDeptService.selectDeptById(deptId);
         List<BizWorkshopTurnover> workshopTurnovers = iBizWorkshopTurnoverService.query()
                 .eq("workshop_id", dept.getWorkshopId())
+                .eq("status",0)
                 .list();
 
         return success(workshopTurnovers);

src/main/resources/mybatis/business/product/BizProcessInspecionMapper.xml

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      column="product_id" select="getProcessDescription"/>
     </resultMap>
 
-
+<!--    AND DATE_FORMAT( start_time, '%Y-%m-%d' ) =${timeString}-->
     <select id="getList" parameterType="BizProcessInspecion" resultMap="BizProcessInspecionResult">
         SELECT * FROM biz_process_inspecion
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
@@ -20,7 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND return_receipt_detail_id =0
             <if test="lotCode != null  and lotCode != ''">AND lot_code = #{lotCode}</if>
             <if test="userId != null  ">AND user_id = #{userId}</if>
-#             <if test="timeString != null and timeString !=''  ">AND DATE_FORMAT( start_time, '%Y-%m-%d' ) =${timeString}</if>
+            <if test="startTimeString != null and startTimeString!=''">AND start_time &gt;= #{startTimeString}</if>
+            <if test="endTimeString != null and endTimeString!='' ">AND start_time &lt;= #{endTimeString}</if>
+
             <if test="status != null ">AND status = #{status}</if>
             <if test="keyword != null  and keyword != '' ">AND (lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code
                 LIKE CONCAT('%',#{keyword},'%') OR
@@ -36,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND return_receipt_detail_id !=0
             <if test="lotCode != null  and lotCode != ''">AND lot_code = #{lotCode}</if>
             <if test="userId != null  ">AND user_id = #{userId}</if>
-#             <if test="timeString != null and timeString !=''  ">AND DATE_FORMAT( start_time, '%Y-%m-%d' )  =#{timeString}</if>
+            <if test="startTimeString != null and startTimeString!=''">AND start_time &gt;= #{startTimeString}</if>
+            <if test="endTimeString != null and endTimeString!='' ">AND start_time &lt;= #{endTimeString}</if>
             <if test="status != null ">AND status = #{status}</if>
             <if test="keyword != null  and keyword != '' ">AND (lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code
                 LIKE CONCAT('%',#{keyword},'%') OR
@@ -47,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
+
     <select id="getProcessDescription" parameterType="java.lang.Long" resultType="java.lang.String" >
         SELECT description FROM biz_product
         WHERE id=#{product_id}