diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index 9971620..d090584 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/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 list = qcService.getShiftList(data); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ShiftData.java b/src/main/java/com/xujie/sys/modules/pms/data/ShiftData.java new file mode 100644 index 0000000..0dd65c3 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 559a8c6..3ad5491 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/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 getShiftList(ShiftData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 74717db..a6f2c26 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/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 getShiftList(ShiftData data) { + List list = qcMapper.getShiftList(data); + return list; + } + @Override public List searchPartInfo(QcFAIRecordData data) { // 获得 site 和 bu diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index 765b666..8cb0190 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java @@ -320,4 +320,6 @@ public interface QcService { List boxNoEnter(QcFAIRecordData data); PageUtils searchSeqInfo2(QcFAIRecordData data); + + List getShiftList(ShiftData data); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index d599737..db4f949 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2017,11 +2017,11 @@ AND #{query.endDate2} >= a.task_date - - AND w.WorkCenterDesc LIKE #{query.workCenterDesc} + + AND a.work_center_no LIKE #{query.workCenterNo} - AND c.shiftdesc LIKE #{query.shiftDesc} + AND c.shiftdesc = #{query.shiftDesc} ORDER BY @@ -4391,6 +4391,13 @@ SET roll_qty = isnull(roll_qty, 0) + #{rollQty} WHERE site = #{site} and BarcodeID = #{seqNo} + +