2022-04-29 BUG 修改

src/main/java/com/gaotao/modules/purchasingManagement/entity/SearchRollInformationData.java

@@ -5,6 +5,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.jdbc.support.CustomSQLErrorCodesTranslation;
 
 import java.util.Date;
+
 //查询-卷信息
 public class SearchRollInformationData {
     private String sapOrderNo;
@@ -54,6 +55,14 @@ public class SearchRollInformationData {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date date4;
     private String synchronizedFlag;
+
+    /**
+     * 失效日期 2022-04-29 LR 添加
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expiredDate;
+
     public String getSapOrderNo() {
         return sapOrderNo;
     }
@@ -317,4 +326,12 @@ public class SearchRollInformationData {
     public void setSynchronizedFlag(String synchronizedFlag) {
         this.synchronizedFlag = synchronizedFlag;
     }
+
+    public Date getExpiredDate() {
+        return expiredDate;
+    }
+
+    public void setExpiredDate(Date expiredDate) {
+        this.expiredDate = expiredDate;
+    }
 }

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -1000,4 +1000,5 @@ public interface ScheduleService {
      * @return java.util.Map<java.lang.String,java.lang.Object>
      **/
     Map<String, Object> getSplitOrderCurrentRollReportedQty(SearchScheduleData inData);
+
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -5,7 +5,6 @@ import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.DateUtil;
 import com.gaotao.common.utils.DateUtils;
 import com.gaotao.common.utils.R;
-import com.gaotao.modules.purchasingManagement.entity.CRollInfoData;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
 import com.gaotao.modules.schedule.data.dto.WorkbenchPostinspection;
 import com.gaotao.modules.schedule.mapper.ProcedureMapper;
@@ -14,6 +13,7 @@ import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.mapper.SchedulingMapper;
 import com.gaotao.modules.schedule.service.ScheduleService;
 import com.gaotao.modules.shopOrder.entity.OperatorData;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2832,17 +2832,38 @@ public class ScheduleServiceImpl implements ScheduleService {
         Map<String, Object>  rollMap = this.getProcessCuttingMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, rmRollNo, rmPartNo, transQty, histSeqNo, operatorId, currentTime);
         //获取打印的卷号
         String printRollNo = String.valueOf(rollMap.get("rollNo"));
-        //获取打印的参数
-        List<Map<String, Object>> printList = new ArrayList<>();
-        //根据条件查询打印的数据
-        CRollInfoData cRollInfoData = new CRollInfoData();
-        cRollInfoData.setSite(site);
-        cRollInfoData.setRollNo(printRollNo);
-        Map<String, Object> printMap = schedulingMapper.getSplitPrintMaterialRoll(cRollInfoData);
-        printList.add(printMap);
+        //调用存储过程获取打印的数据
+        List<Map<String, Object>> printList = this.getMaterialRollReturnPrintData(site, orderNo, printRollNo);
         return printList;
     }
 
+    /**
+     * TODO 获取 下料打印的查询数据
+     * @author LR
+     * @date 2022/4/29 15:34
+     * @Param [site, orderNo, rollNo]
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    public List<Map<String, Object>> getMaterialRollReturnPrintData(String site, String orderNo, String rollNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(rollNo);
+        //调用存储过程
+        List<Map<String, Object>> resulitList = procedureMapper.getProcedureData("getMaterialRollReturnPrintData", params);
+        //返回参数
+        return resulitList;
+    }
+
+    /**
+     * TODO 获取下料打印的数据
+     * @author LR
+     * @date 2022/4/29 15:28
+     * @Param null
+     * @return
+     **/
+
+
     /**
      * TODO 调用存储过程  执行材料下料的功能 返回卷号
      * @author LR

src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml

@@ -8,6 +8,7 @@
          T.PartNo,dbo.Get_Part_DescSpec(T.Site,T.PartNo) as PartDescription,T.RollNo,T.RollQty,T.consumedqty,
          T.SuppDeliveryNote,T.RollDate,T.CreatedDate,T.CreatedBy,T.Status as RollStatus,T.SuppRollNoFlag,
          T.SuppRollNo,T.Site,T.SourceType as Type,T.OriginalRollNo,T.OrderRef6,T.warehouseid,T.OrderRef7,
+            T.ExpiredDate, /*2022-04-29 LR 添加*/
          T.CustomerID,Isnull(T.frozenflag,'N') as frozenflag,T.frozendate,T.frozenby
         from View_C_RollInfo as T
         Left Join C_OrderSlittedList as D On D.OrderRef1 = T.OrderRef1 and D.OrderRef2 = T.OrderRef2 and D.OrderRef3 = T.OrderRef3 and D.Type = T.OrderRef4

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

@@ -248,7 +248,7 @@
 
     <!--2022-04-24 获取分切材料打印分切卷的标签-->
     <select id="getSplitPrintMaterialRoll" parameterType="com.gaotao.modules.purchasingManagement.entity.CRollInfoData" resultType="java.util.HashMap">
-        SELECT cri.RollNo rollNo, cri.PartNo partNo,
+       SELECT cri.RollNo rollNo, cri.PartNo partNo,
        (CASE WHEN dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN cri.SupplierID ELSE dbo.Get_ReferenceInfo_SupplierID(cri.Site,cri.PartNo,cri.CustomerID,cri.FGPartNo) END) supplierId,
        dbo.Get_SupplierDesc(cri.Site, (CASE WHEN dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN cri.SupplierID ELSE dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) END)) supplierDesc,
        (CASE WHEN dbo.Get_ReferenceInfo_PartDesc(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN pt.PartDescription ELSE dbo.Get_ReferenceInfo_PartDesc(cri.Site,cri.PartNo,cri.CustomerID,cri.FGPartNo) END) partDesc,