From 0bc0149e877d403978c26b3d8cf7ce6e7b6e7b6e Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Fri, 29 Apr 2022 17:32:31 +0800 Subject: [PATCH] =?UTF-8?q?2022-04-29=20BUG=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SearchRollInformationData.java | 17 ++++++++ .../schedule/service/ScheduleService.java | 1 + .../service/impl/ScheduleServiceImpl.java | 39 ++++++++++++++----- .../MaterialSplitMapper.xml | 1 + .../mapper/schedule/SchedulingMapper.xml | 2 +- 5 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gaotao/modules/purchasingManagement/entity/SearchRollInformationData.java b/src/main/java/com/gaotao/modules/purchasingManagement/entity/SearchRollInformationData.java index faf6d32..7023d90 100644 --- a/src/main/java/com/gaotao/modules/purchasingManagement/entity/SearchRollInformationData.java +++ b/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; + } } diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java index 370e75c..bf6c263 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -1000,4 +1000,5 @@ public interface ScheduleService { * @return java.util.Map **/ Map getSplitOrderCurrentRollReportedQty(SearchScheduleData inData); + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index d5d6fe0..541535e 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/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 rollMap = this.getProcessCuttingMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, rmRollNo, rmPartNo, transQty, histSeqNo, operatorId, currentTime); //获取打印的卷号 String printRollNo = String.valueOf(rollMap.get("rollNo")); - //获取打印的参数 - List> printList = new ArrayList<>(); - //根据条件查询打印的数据 - CRollInfoData cRollInfoData = new CRollInfoData(); - cRollInfoData.setSite(site); - cRollInfoData.setRollNo(printRollNo); - Map printMap = schedulingMapper.getSplitPrintMaterialRoll(cRollInfoData); - printList.add(printMap); + //调用存储过程获取打印的数据 + List> 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> + **/ + public List> getMaterialRollReturnPrintData(String site, String orderNo, String rollNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(rollNo); + //调用存储过程 + List> resulitList = procedureMapper.getProcedureData("getMaterialRollReturnPrintData", params); + //返回参数 + return resulitList; + } + + /** + * TODO 获取下料打印的数据 + * @author LR + * @date 2022/4/29 15:28 + * @Param null + * @return + **/ + + /** * TODO 调用存储过程 执行材料下料的功能 返回卷号 * @author LR diff --git a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml index 1db2bb8..7ff65d7 100644 --- a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml +++ b/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 diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 6dbb1ee..4f6de23 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -248,7 +248,7 @@