From 03d3566c45d02eb814915a8a5757a08c208dbf83 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 31 Oct 2022 18:16:26 +0800 Subject: [PATCH] 1 --- .../controller/ScheduleController.java | 29 ++++++++++++ .../modules/schedule/dao/ScheduleMapper.java | 11 +++++ .../modules/schedule/entity/ScheduleData.java | 9 ++++ .../modules/schedule/entity/SfdcCancel.java | 40 ++++++++++++++++ .../service/Impl/ScheduleServiceImpl.java | 26 +++++++++++ .../schedule/service/ScheduleService.java | 22 +++++++++ .../mapper/schedule/ScheduleMapper.xml | 46 ++++++++++++++++++- 7 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/srq/modules/schedule/entity/SfdcCancel.java diff --git a/src/main/java/com/srq/modules/schedule/controller/ScheduleController.java b/src/main/java/com/srq/modules/schedule/controller/ScheduleController.java index bc0ac86..f138426 100644 --- a/src/main/java/com/srq/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/srq/modules/schedule/controller/ScheduleController.java @@ -209,4 +209,33 @@ public class ScheduleController { scheduleService.saveSfdc(inData); return R.ok(); } + + /** + * @Description 获取报工信息 + * @Title SfdcCancel + * @param inData + * @author rq + * @date 2022/10/25 18:16 + * @return R + * @throw + */ + @PostMapping("/getSfdcList") + public R getSfdcList(@RequestBody SfdcCancel inData){ + List result= scheduleService.getSfdcList(inData); + return R.ok().put("rows",result); + } + /** + * @Description 取消报工信息 + * @Title cancelSfdc + * @param inData + * @author rq + * @date 2022/10/25 18:16 + * @return R + * @throw + */ + @PostMapping("/cancelSfdc") + public R saveSfdc(@RequestBody SfdcCancel inData){ + scheduleService.cancelSfdc(inData); + return R.ok(); + } } diff --git a/src/main/java/com/srq/modules/schedule/dao/ScheduleMapper.java b/src/main/java/com/srq/modules/schedule/dao/ScheduleMapper.java index 37b5733..7cbe89b 100644 --- a/src/main/java/com/srq/modules/schedule/dao/ScheduleMapper.java +++ b/src/main/java/com/srq/modules/schedule/dao/ScheduleMapper.java @@ -212,4 +212,15 @@ public interface ScheduleMapper { * @throw */ void saveDefectList(SfdcDefectHist inData); + + /** + * @Description 获取报工数据 + * @Title getSfdcList + * @param inData + * @author rq + * @date 2022/10/31 16:31 + * @return List + * @throw + */ + List getSfdcList(SfdcCancel inData); } diff --git a/src/main/java/com/srq/modules/schedule/entity/ScheduleData.java b/src/main/java/com/srq/modules/schedule/entity/ScheduleData.java index 8f534dc..8ab4d1f 100644 --- a/src/main/java/com/srq/modules/schedule/entity/ScheduleData.java +++ b/src/main/java/com/srq/modules/schedule/entity/ScheduleData.java @@ -35,6 +35,7 @@ public class ScheduleData { private Date orderDate; private String orderRef1; List scheduleDetail; + private String operationDesc; public String getOrderNo() { return orderNo; @@ -187,4 +188,12 @@ public class ScheduleData { public void setOrderRef1(String orderRef1) { this.orderRef1 = orderRef1; } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } } diff --git a/src/main/java/com/srq/modules/schedule/entity/SfdcCancel.java b/src/main/java/com/srq/modules/schedule/entity/SfdcCancel.java new file mode 100644 index 0000000..92de575 --- /dev/null +++ b/src/main/java/com/srq/modules/schedule/entity/SfdcCancel.java @@ -0,0 +1,40 @@ +package com.srq.modules.schedule.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class SfdcCancel { + private String site; + private String orderNo; + private Double itemNo; + private String operationDesc; + private Integer seqNo; + private String partNo; + private String workCenterNo; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date reportDate; + private String operatorId; + private String operatorName; + private BigDecimal reportQty; + private BigDecimal approveQty; + private BigDecimal reportedManfTime; + private Integer assJobSeqNo; + private String shiftNo; + private String shiftDesc; + private String resourceId; + private String resourceDesc; + private String batchNo; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; + private String reverseflag; +} diff --git a/src/main/java/com/srq/modules/schedule/service/Impl/ScheduleServiceImpl.java b/src/main/java/com/srq/modules/schedule/service/Impl/ScheduleServiceImpl.java index ff166c7..be569ff 100644 --- a/src/main/java/com/srq/modules/schedule/service/Impl/ScheduleServiceImpl.java +++ b/src/main/java/com/srq/modules/schedule/service/Impl/ScheduleServiceImpl.java @@ -78,6 +78,7 @@ public class ScheduleServiceImpl implements ScheduleService { saveData.setShiftNo(inData.getScheduleDetail().get(i).getShiftNo()); saveData.setScheduleDate(inData.getScheduleDetail().get(i).getScheduleDate()); saveData.setOperatorId(inData.getScheduleDetail().get(i).getOperatorId()); + saveData.setOperationDesc(inData.getOperationDesc()); scheduleMapper.saveSchedule(saveData); } @@ -324,4 +325,29 @@ public class ScheduleServiceImpl implements ScheduleService { } } } + @Override + public List getSfdcList(SfdcCancel inData){ + return scheduleMapper.getSfdcList(inData); + } + @Override + @Transactional + public void cancelSfdc(SfdcCancel inData){ + List params = new ArrayList<>(); +// 工厂编码 + params.add(inData.getSite()); +// 工单号 + params.add(inData.getOrderNo()); +// 工序号 + params.add(inData.getItemNo()); +// 次序号 + params.add(inData.getSeqNo()); + List> resultList = procedureDao.getProcedureData("sfdc_cancelsfdc", params); + Map map = resultList.get(0); + if(map == null){ + throw new RuntimeException("返回结果错误！"); + }else if(Integer.parseInt(String.valueOf(map.get("resultCode"))) != 200) { + throw new RuntimeException(String.valueOf(map.get("resultMsg"))); + } + } + } diff --git a/src/main/java/com/srq/modules/schedule/service/ScheduleService.java b/src/main/java/com/srq/modules/schedule/service/ScheduleService.java index ddca1dd..a1c8203 100644 --- a/src/main/java/com/srq/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/srq/modules/schedule/service/ScheduleService.java @@ -135,4 +135,26 @@ public interface ScheduleService { * @throw */ void saveSfdc(SfdcData inData); + + /** + * @Description 获取报工数据 + * @Title getSfdcList + * @param inData + * @author rq + * @date 2022/10/31 16:31 + * @return List + * @throw + */ + List getSfdcList(SfdcCancel inData); + + /** + * @Description 取消报工信息 + * @Title cancelSfdc + * @param inData + * @author rq + * @date 2022/10/31 17:43 + * @return void + * @throw + */ + void cancelSfdc(SfdcCancel inData); } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 615a910..4a4f9dd 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -35,6 +35,9 @@ and ${planStatus} + + and sr.WorkCenterNo like #{workCenterNo} + order by so.NeedDate,so.EnterDate @@ -78,11 +81,11 @@ Insert into soscheduledrouting(Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,PlanStartTime,PlanFinishTime ,BarcodeID,Remark,Crewsize,ClosedFlag,QtyScrapt,OutWorkFlag,S_ScheduledDate,S_ResourceID,S_ShiftNo,S_WorkCenterNo ,SelectedFlag,SourceFlag,ParkFlag,TimeRequired_Original,QtyRequired_Original - ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,operatorId,partNo) + ,StartProdFlag,CancelledProdFlag,Efficiency,EnteredDate,operatorId,partNo,operation_desc) values(#{site},#{orderNo},#{itemNo},#{seqNo},#{scheduleQty},0,0,null,0,#{scheduleDate},#{scheduleDate} ,'*','',1,'N',0,'N',#{scheduleDate},#{resourceId},#{shiftNo},#{workCenterNo} ,'N','N','N',null,null - ,'N','N',#{efficiency},GETDATE(),#{operatorId},#{partNo}) + ,'N','N',#{efficiency},GETDATE(),#{operatorId},#{partNo},#{operationDesc}) update so_schedule_list set QtyScheduled=QtyScheduled+#{sumQty} where Site=#{site} and OrderNo=#{orderNo} and itemNo=#{itemNo} @@ -196,4 +199,43 @@ insert into SFDC_DefectHist (Site,OrderNo,ItemNo,SeqNo,HistSeqNo,ReportDate,Reportedby,DefectCode,DefectQty,Remark,RollNo,DefectDesc) values(#{site},#{orderNo},#{itemNo},#{seqNo},#{histSeqNo},GetDate(),#{reportedby},#{defectCode},#{defectQty},#{remark},'*',#{defectDesc}) + + \ No newline at end of file