1

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<SfdcCancel> 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();
+    }
 }

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<SfdcCancel>
+     * @throw
+     */
+    List<SfdcCancel> getSfdcList(SfdcCancel inData);
 }

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> 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;
+    }
 }

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;
+}

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<SfdcCancel> getSfdcList(SfdcCancel inData){
+        return scheduleMapper.getSfdcList(inData);
+    }
+    @Override
+    @Transactional
+    public void cancelSfdc(SfdcCancel inData){
+        List<Object> params = new ArrayList<>();
+//        工厂编码
+        params.add(inData.getSite());
+//        工单号
+        params.add(inData.getOrderNo());
+//        工序号
+        params.add(inData.getItemNo());
+//        次序号
+         params.add(inData.getSeqNo());
+        List<Map<String, Object>> resultList = procedureDao.getProcedureData("sfdc_cancelsfdc", params);
+        Map<String ,Object> 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")));
+        }
+    }
+
 }

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<SfdcCancel>
+     * @throw
+     */
+    List<SfdcCancel> getSfdcList(SfdcCancel inData);
+
+    /**
+     * @Description 取消报工信息
+     * @Title cancelSfdc
+      * @param inData
+     * @author rq
+     * @date 2022/10/31 17:43
+     * @return void
+     * @throw
+     */
+    void cancelSfdc(SfdcCancel inData);
 }

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -35,6 +35,9 @@
              <if test="planStatus != null and planStatus != ''">
                 and  ${planStatus}
             </if>
+             <if test="workCenterNo != null and workCenterNo != ''">
+                and  sr.WorkCenterNo like #{workCenterNo}
+            </if>
         </where>
 
         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})
     </insert>
     <update id="updateScheduleListQty">
         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})
     </insert>
+
+    <select id="getSfdcList" resultType="com.srq.modules.schedule.entity.SfdcCancel">
+        select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,
+        a.AssJobSeqNo,a.ResourceID,a.BatchNo,b.S_ShiftNo ShiftNo,b.partNo,b.operation_desc,c.OperatorName,d.ShiftDesc,e.ResourceDesc,Reverseflag
+        from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo
+        left join Operator c on a.site=b.site and a.OperatorID=c.OperatorID LEFT JOIN Calendar_DateType_Shift d on a.Site=d.Site and b.S_ShiftNo=d.ShiftNo
+        left join WorkCenterResource e on a.Site=e.Site and a.ResourceID =e.ResourceID and a.WorkCenterNo=e.WorkCenterNo
+        <where>
+            AND a.site=#{site}
+             <if test="orderNo != null and orderNo != ''">
+                and a.OrderNo like #{orderNo}
+            </if>
+             <if test="workCenterNo != null and workCenterNo != ''">
+                and a.WorkCenterNo like #{workCenterNo}
+            </if>
+             <if test="partNo != null and partNo != ''">
+                and b.partNo = #{partNo}
+            </if>
+             <if test="itemNo != null and itemNo != ''">
+                and a.ItemNo = #{itemNo}
+            </if>
+             <if test="operatorName != null and operatorName != ''">
+                and c.OperatorName like #{operatorName}
+            </if>
+             <if test="resourceId != null and resourceId != ''">
+                and a.ResourceID = #{resourceId}
+            </if>
+             <if test="shiftNo != null and shiftNo != ''">
+                and b.S_ShiftNo = #{shiftNo}
+            </if>
+            <if test="startDate != null ">
+                and S_ScheduledDate >= #{startDate}
+            </if>
+            <if test="endDate != null ">
+                and #{endDate} >= S_ScheduledDate
+            </if>
+        </where>
+        order by a.ReportDate desc
+    </select>
 </mapper>