2024-12-11

优化

src/main/java/com/xujie/sys/modules/pms/controller/QcController.java

@@ -2027,6 +2027,17 @@ public class QcController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * 获取班次
+     * @param data
+     * @return
+     */
+    @PostMapping("/getShiftList")
+    public R getShiftList(@RequestBody ShiftData data){
+        List<ShiftData> list = qcService.getShiftList(data);
+        return R.ok().put("rows", list);
+    }
+
 }
 
 

src/main/java/com/xujie/sys/modules/pms/data/ShiftData.java

@@ -0,0 +1,10 @@
+package com.xujie.sys.modules.pms.data;
+
+import lombok.Data;
+
+@Data
+public class ShiftData {
+
+    private String site;
+    private String shiftDesc;
+}

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -589,4 +589,6 @@ public interface QcMapper {
     void deleteInspectionFiles(QcFAIRecordData qcData);
 
     void updateSOScheduledRoutingRollQty(@Param("site") String site, @Param("seqNo") String seqNo, @Param("rollQty") BigDecimal rollQty);
+
+    List<ShiftData> getShiftList(ShiftData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -5005,6 +5005,12 @@ public class QcServiceImpl implements QcService {
         return new PageUtils(list);
     }
 
+    @Override
+    public List<ShiftData> getShiftList(ShiftData data) {
+        List<ShiftData> list = qcMapper.getShiftList(data);
+        return list;
+    }
+
     @Override
     public List<QcFAIRecordData> searchPartInfo(QcFAIRecordData data) {
         // 获得 site 和 bu

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -320,4 +320,6 @@ public interface QcService {
     List<QcFAIRecordData> boxNoEnter(QcFAIRecordData data);
 
     PageUtils searchSeqInfo2(QcFAIRecordData data);
+
+    List<ShiftData> getShiftList(ShiftData data);
 }

src/main/resources/mapper/pms/QcMapper.xml

@@ -2017,11 +2017,11 @@
             <if test="query.endDate2 != null">
                 AND #{query.endDate2} >= a.task_date
             </if>
-            <if test = "query.workCenterDesc != null and query.workCenterDesc != ''">
-                AND w.WorkCenterDesc LIKE #{query.workCenterDesc}
+            <if test = "query.workCenterNo != null and query.workCenterNo != ''">
+                AND a.work_center_no LIKE #{query.workCenterNo}
             </if>
             <if test = "query.shiftDesc != null and query.shiftDesc != ''">
-                AND c.shiftdesc LIKE #{query.shiftDesc}
+                AND c.shiftdesc = #{query.shiftDesc}
             </if>
         </where>
         ORDER BY
@@ -4391,6 +4391,13 @@
         SET roll_qty = isnull(roll_qty, 0) + #{rollQty}
         WHERE site = #{site} and BarcodeID = #{seqNo}
     </update>
+
+    <select id="getShiftList" parameterType="ShiftData" resultType="ShiftData">
+        SELECT distinct
+            shiftdesc
+        FROM calendar_datetype_shift
+        WHERE site = #{site}
+    </select>
 </mapper>