diff --git a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java index 1285433..81674fb 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java +++ b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java @@ -3,7 +3,9 @@ package com.gaotao.modules.orderIssure.controller; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.app.entity.WorkCenter; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.service.IssureNotifyService; import com.gaotao.modules.orderIssure.vo.EamWorkShop; @@ -374,4 +376,13 @@ public class IssureNotifyController { return R.ok().put("rows", list); } + /** + * 查加工中心 + */ + @PostMapping("/getWorkCenterList") + public R getWorkCenterList(@RequestBody BuData data){ + List list = issureNotifyService.getWorkCenterList(data); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java index 35b8531..597b0e5 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java +++ b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.vo.EamWorkShop; import com.gaotao.modules.orderIssure.vo.IssueNotifyChangeLog; @@ -184,4 +185,6 @@ public interface IssureNotifyMapper extends BaseMapper { List getBomAlternativeParts(BomAlternativePartsData data); void deleteNotifyMaterial2(SOIssueNotifyOrderMaterialListData data); + + List getWorkCenterList(BuData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java index 982e98e..3591d59 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java @@ -2,6 +2,7 @@ package com.gaotao.modules.orderIssure.service; import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.vo.EamWorkShop; import com.gaotao.modules.orderIssure.vo.IssueNotifyChangeLog; @@ -157,4 +158,6 @@ public interface IssureNotifyService { * @return 替代料列表 */ List getBomAlternativeParts(BomAlternativePartsData data); + + List getWorkCenterList(BuData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index 34b9155..e44857c 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -8,6 +8,7 @@ import com.gaotao.common.utils.BigDecimalUtils; import com.gaotao.common.utils.DateUtils; import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.inboundNotification.entity.vo.InboundNotificationDetailVo; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.mapper.IssureNotifyMapper; @@ -386,8 +387,6 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { /** * 获取用户 bu - * @param data - * @return */ @Override public List getSiteAndBuByUserName(BuData data) { @@ -395,6 +394,15 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { return list; } + /** + * 查加工中心 + */ + @Override + public List getWorkCenterList(BuData data) { + List list = issureNotifyMapper.getWorkCenterList(data); + return list; + } + @Override @Transactional public void saveIssueNoOrderDetail(SOIssueNotifyOrderListData data){ diff --git a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java index 31bc7a3..44b33f7 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java +++ b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java @@ -200,6 +200,17 @@ public class SOIssueNotifyHeader extends QueryPage implements Serializable { //@TableField(updateStrategy = FieldStrategy.IGNORED) private Date confirmDate; + @TableField("work_center_no") + private String workCenterNo; + + public String getConfirmStatus() { + return confirmStatus; + } + + public void setConfirmStatus(String confirmStatus) { + this.confirmStatus = confirmStatus; + } + public String getNotifyNo() { return notifyNo; } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 128966a..83606e7 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -13,12 +13,11 @@ insert into SOIssueNotifyHeader (NotifyNo,Site,NotifyDate,UserName,EnteredDate,Receiver,DepartmentID,Remark,CreditFlag,IssueFlag,IssueResult,PlanIssueDate, -RealIssueDate,Status,HaveIssueRecordFlag,CalcFlag,NeedApproveFlag,ApprovedFlag,Approver,ApproveDate,WarehouseID, -RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) + RealIssueDate,Status,HaveIssueRecordFlag,CalcFlag,NeedApproveFlag,ApprovedFlag,Approver,ApproveDate,WarehouseID, + RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu, work_center_no) values(#{notifyNo},#{site},#{notifyDate},#{userName},#{enteredDate},#{receiver},#{departmentID},#{remark},#{creditFlag},#{issueFlag},#{issueResult},#{planIssueDate}, #{realIssueDate},#{status},#{haveIssueRecordFlag},#{calcFlag},#{needApproveFlag},#{approvedFlag},#{approver},#{approveDate},#{warehouseID}, - #{recordVersion},#{outWorkOrderFlag},#{projectID},#{orderType},#{authRuleID},#{bu} - ) + #{recordVersion},#{outWorkOrderFlag},#{projectID},#{orderType},#{authRuleID},#{bu}, #{workCenterNo}) update SOIssueNotifyHeader set bu=#{bu} where site=#{site} and NotifyNo=#{notifyNo} @@ -292,7 +291,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) ${query.sql} - order by a.NotifyNo + order by a.NotifyNo desc + + \ No newline at end of file