diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 4c3e75e8..9bab2f9e 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -22,7 +22,7 @@ public interface ProOrderWorkorderMapper { /** * 查询生产工单 * - * @param workorderId 生产工单主键 + * @param workorderId 工单code * @return 生产工单 */ public ProOrderWorkorder selectProOrderWorkorderByWorkorderId(String workorderId); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 21590aa1..4e1e9b2a 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -590,7 +590,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { // 通过班次id查询班次名称 String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId()); // 通过设备code查询出机型名称 - String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(proOrderWorkorder.getWorkorderId()).getProdLineCode()); + String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(proOrderWorkorder.getWorkorderCode()).getProdLineCode()); // 通过工单id查询批次号 List batchCodeList = proOrderMapper.selectBatchCodesById(proOrderWorkorder.getWorkorderId()); List batchCodes = new ArrayList<>(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 6463d76c..27664c9c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -1,9 +1,6 @@ package com.op.quality.controller; -import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.domain.R; -import com.op.common.core.utils.uuid.UUID; -import com.op.quality.domain.BaseFile; import com.op.quality.domain.QcProCheck; import com.op.quality.service.QcProCheckService; import com.op.system.api.RemoteMesService; @@ -11,8 +8,6 @@ import com.op.system.api.domain.dto.WCSDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Map; - /** * @ClassName : quaController * @Description : @@ -28,63 +23,17 @@ public class QuaController { private RemoteMesService remoteMesService; @PostMapping("/saveQcProCheck") - public R saveQcProCheck(@RequestBody Map map) { -// System.out.println(qcProCheck); -// System.out.println(baseFile); - QcProCheck qcProCheck = map.keySet().iterator().next(); - BaseFile baseFile = map.values().iterator().next(); - - if (!qcProCheck.getFactoryCode().isEmpty()){ - if (baseFile==null){ - baseFile = new BaseFile(); - qcProCheckService.saveQcProCheck(qcProCheck,baseFile); - } + public R saveQcProCheck(@RequestBody QcProCheck qcProCheck) { - if (qcProCheck.getIsqua()=="1"){ - System.out.println("调用wcs接口开发转移"); + qcProCheckService.saveQcProCheck(qcProCheck); + if (qcProCheck.getIsqua()=="1") { WCSDTO wcsdto = new WCSDTO(); wcsdto.setFactory(qcProCheck.getFactoryCode()); wcsdto.setRfidNo(qcProCheck.getRfid()); remoteMesService.requestDestinationStations(wcsdto); - return R.ok(); - } - else{ - return R.fail(); } - } return R.fail(); } - @PostMapping("/test") - public R test() { -// System.out.println(qcProCheck); -// System.out.println(baseFile); -// QcProCheck qcProCheck = map.keySet().iterator().next(); -// BaseFile baseFile = map.values().iterator().next(); - QcProCheck qcProCheck = new QcProCheck(); - BaseFile baseFile = new BaseFile(); -// qcProCheck.setId("1232132132121321"); - qcProCheck.setRfid("rfiddddddddddddddddddddddddddddddddddddd"); - qcProCheck.setFactoryCode("qewqewqewq"); - qcProCheck.setIsqua("1"); - baseFile.setFileAddress("qwewqewqewqewqewqq"); - if (!qcProCheck.getFactoryCode().isEmpty()){ - if (baseFile==null){ - baseFile = new BaseFile(); - qcProCheckService.saveQcProCheck(qcProCheck,baseFile); - } - else { - qcProCheckService.saveQcProCheck(qcProCheck,baseFile); - } - if (qcProCheck.getIsqua()=="1"){ - System.out.println("调用下一个接口"); - return R.ok(); - } - else{ - return R.ok(); - } - } - return R.fail(); - } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheckMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheckMapper.java new file mode 100644 index 00000000..743cd343 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheckMapper.java @@ -0,0 +1,31 @@ +package com.op.quality.mapper; + +import com.op.common.core.domain.R; +import com.op.quality.domain.QcProCheck; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName : QuaMapper + * @Description : + * @Author : + * @Date: 2023-08-17 10:40 + */ +@Mapper +public interface QcProCheckMapper { + + + + List selectQcProCheckList(); + + int insertQcProCheck(QcProCheck qcProCheck); + + int updateQcProCheckById(String rfid); + + int deleteQcProCheckById(String rfid); + + + + +} diff --git a/op-modules/op-quality/src/main/resources/mapper/BaseFileMapper.xml b/op-modules/op-quality/src/main/resources/mapper/BaseFileMapper.xml deleted file mode 100644 index 12c329d4..00000000 --- a/op-modules/op-quality/src/main/resources/mapper/BaseFileMapper.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select file_id, file_name, file_address, source_id, remark, attr1, - attr2, attr3, attr4, create_by, create_time, update_by, - update_time from base_file - - - - - - - - - insert into base_file - - file_id, - file_name, - file_address, - source_id, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{fileId}, - #{fileName}, - #{fileAddress}, - #{sourceId}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time) - VALUES - - ( - #{baseFile.fileId}, - #{baseFile.fileName}, - #{baseFile.fileAddress}, - #{baseFile.sourceId}, - #{baseFile.remark}, - #{baseFile.createBy}, - #{baseFile.createTime} - ) - - - - - update base_file - - file_name = #{fileName}, - file_address = #{fileAddress}, - source_id = #{sourceId}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where file_id = #{fileId} - - - - delete from base_file where file_id = #{fileId} - - - - delete from base_file where file_id in - - #{fileId} - - - - delete from base_file where source_id = #{sourceId} - -