From 6988359d6da0b375c914b4e58d6f876b397946d1 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 12 May 2022 14:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=20=20=E6=97=A5=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/entity/SOScheduledRoutingData.java | 9 +++++++++ .../modules/production/dao/PalletMapper.java | 19 ++++++++++++++++++- .../service/impl/PalletServiceImpl.java | 6 ++++++ .../modules/sys/entity/SysUserEntity.java | 7 +++---- .../mapper/production/DailyPlanMapper.xml | 2 +- .../mapper/production/PalletMapper.xml | 14 ++++++++++++-- 6 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/letian/modules/base/entity/SOScheduledRoutingData.java b/src/main/java/com/letian/modules/base/entity/SOScheduledRoutingData.java index 0982f5b..b973a7f 100644 --- a/src/main/java/com/letian/modules/base/entity/SOScheduledRoutingData.java +++ b/src/main/java/com/letian/modules/base/entity/SOScheduledRoutingData.java @@ -192,6 +192,7 @@ public class SOScheduledRoutingData { */ private String virtualResourceFlag; private String operationDesc; + private String resourceId; public String getSite() { return site; @@ -480,5 +481,13 @@ public class SOScheduledRoutingData { public void setOperationDesc(String operationDesc) { this.operationDesc = operationDesc; } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } } diff --git a/src/main/java/com/letian/modules/production/dao/PalletMapper.java b/src/main/java/com/letian/modules/production/dao/PalletMapper.java index 16bc1a9..b73774b 100644 --- a/src/main/java/com/letian/modules/production/dao/PalletMapper.java +++ b/src/main/java/com/letian/modules/production/dao/PalletMapper.java @@ -1,11 +1,13 @@ package com.letian.modules.production.dao; +import com.letian.modules.base.entity.SOScheduledRoutingData; import com.letian.modules.base.utils.ResponseData; import com.letian.modules.pda.entity.NotifyHeaderOutData; import com.letian.modules.pda.entity.StockDataInData; import com.letian.modules.production.entity.*; import com.letian.modules.sys.entity.SysUserEntity; import com.letian.modules.sys.entity.UserIpData; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -26,7 +28,7 @@ public interface PalletMapper { */ List getPalletData(PalletListData inData); void updateQtyReported(@Param("site") String site,@Param("orderNo") String orderNo,@Param("orderDate") String orderDate,@Param("shiftId") String shiftId); - + void updateSOSdelFlag(@Param("site") String site,@Param("orderNo") String orderNo,@Param("orderDate") String orderDate,@Param("shiftId") String shiftId,@Param("userId") String userId); /** * @Description 保存栈板信息 * @Title savePallet @@ -269,4 +271,19 @@ public interface PalletMapper { List getNotifyHeaderData(@Param("site") String site,@Param("delNotifyNo") String delNotifyNo); void finishPreparation(@Param("site") String site,@Param("delNotifyNo") String delNotifyNo,@Param("username") String username); + + SOScheduledRoutingData getSOScheduleData(@Param("site") String site,@Param("orderNo") String orderNo,@Param("orderDate") String orderDate,@Param("shiftId") String shiftId); + /** + * @Description TODO + * @Title deleteSOSList + * @param site +  * @param orderNo +  * @param orderDate +  * @param shiftId + * @author rq + * @date 2022/5/10 16:36 + * @return void + * @throw + */ + void deleteSOSList(@Param("site") String site,@Param("workCenterNo") String workCenterNo,@Param("resourceId") String resourceId,@Param("seqNo") Integer seqNo); } diff --git a/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java b/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java index e4c47ed..53e16b6 100644 --- a/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java +++ b/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java @@ -1,6 +1,7 @@ package com.letian.modules.production.service.impl; import com.letian.common.utils.IPUtils; +import com.letian.modules.base.entity.SOScheduledRoutingData; import com.letian.modules.base.utils.DateUtils; import com.letian.modules.base.utils.ResponseData; import com.letian.modules.pda.dao.*; @@ -310,6 +311,11 @@ public class PalletServiceImpl implements PalletService { detailSubs.add(detailSub); //更新派工单上报工数量 palletMapper.updateQtyReported(site,inList.get(j).getOrderNo(),inData.getOrderDate(),inData.getShiftid()); + SOScheduledRoutingData getSOScheduleData= palletMapper.getSOScheduleData(site,inList.get(j).getOrderNo(),inData.getOrderDate(),inData.getShiftid()); + if(getSOScheduleData.getQtyRequired()<=getSOScheduleData.getQtyReported()){ + palletMapper.updateSOSdelFlag(site,inList.get(j).getOrderNo(),inData.getOrderDate(),inData.getShiftid(),userId); + palletMapper.deleteSOSList(site,getSOScheduleData.getsWorkCenterNo(),getSOScheduleData.getsResourceID(),getSOScheduleData.getSeqNo()); + } } //批量保存当前的序列号数据 transDao.batchInsertTransDetailSubs(detailSubs); diff --git a/src/main/java/com/letian/modules/sys/entity/SysUserEntity.java b/src/main/java/com/letian/modules/sys/entity/SysUserEntity.java index c882343..5c61142 100644 --- a/src/main/java/com/letian/modules/sys/entity/SysUserEntity.java +++ b/src/main/java/com/letian/modules/sys/entity/SysUserEntity.java @@ -84,14 +84,13 @@ public class SysUserEntity implements Serializable { * 工厂编号 */ @NotBlank(message="工厂编码不能为空", groups = {AddGroup.class, UpdateGroup.class}) - private Long site; + private String site; - - public Long getSite() { + public String getSite() { return site; } - public void setSite(Long site) { + public void setSite(String site) { this.site = site; } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index d23db54..c8eb809 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -74,7 +74,7 @@ and D.EnterDate= ]]> #{date3} - and D.EnterDate-1 #{date4} + and D.EnterDate-1 #{date4} and D.NeedDate= ]]>#{date1} diff --git a/src/main/resources/mapper/production/PalletMapper.xml b/src/main/resources/mapper/production/PalletMapper.xml index aa4ea84..f26429e 100644 --- a/src/main/resources/mapper/production/PalletMapper.xml +++ b/src/main/resources/mapper/production/PalletMapper.xml @@ -3,7 +3,7 @@ @@ -184,6 +184,12 @@ update SOScheduledRouting set QtyReported=QtyReported+1 where Site =#{site} and OrderNo=#{orderNo} and S_ScheduledDate=#{orderDate} and S_ShiftNo=#{shiftId} + + update SOScheduledRouting set ClosedFlag='Y',Closedby=#{userId},ClosedDate=GetDate() where Site =#{site} and OrderNo=#{orderNo} and S_ScheduledDate=#{orderDate} and S_ShiftNo=#{shiftId} + + @@ -191,4 +197,8 @@ update CODelNotifyHeader set pickupStatus='备货完成',Pickupdate=GetDate(),Pickupby=#{username} where Site =#{site} and DelNotifyNo=#{delNotifyNo} + + + delete from SOScheduledList where Site=#{site} and WorkCenterNo=#{workCenterNo} and ResourceID=#{resourceId} and LinkedSeqNo=#{seqNo} + \ No newline at end of file