2025-11-25

领料申请管理
1、状态增加：待确认，下拉筛选中也需要
  1.1 草稿状态点击"提交"后，将状态改为待确认
  1.2 待确认状态点击"下达"后，将状态改为待出库
2、主表SOIssueNotifyHeader增加车间选项，保存到work_center_no字段，查询和列表中展示该字段，非必填
3、主页面的排序按照单号倒排desc

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<WorkCenterData> list = issureNotifyService.getWorkCenterList(data);
+        return R.ok().put("rows", list);
+    }
+
 }

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<SOIssueNotifyHeader> {
     List<BomAlternativePartsData> getBomAlternativeParts(BomAlternativePartsData data);
 
     void deleteNotifyMaterial2(SOIssueNotifyOrderMaterialListData data);
+
+    List<WorkCenterData> getWorkCenterList(BuData data);
 }

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<BomAlternativePartsData> getBomAlternativeParts(BomAlternativePartsData data);
+
+    List<WorkCenterData> getWorkCenterList(BuData data);
 }

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<BuData> getSiteAndBuByUserName(BuData data) {
@@ -395,6 +394,15 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
         return list;
     }
 
+    /**
+     * 查加工中心
+     */
+    @Override
+    public List<WorkCenterData> getWorkCenterList(BuData data) {
+        List<WorkCenterData> list = issureNotifyMapper.getWorkCenterList(data);
+        return list;
+    }
+
     @Override
     @Transactional
     public void saveIssueNoOrderDetail(SOIssueNotifyOrderListData data){

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

src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml

@@ -14,11 +14,10 @@
     <insert id="createNotify">
         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)
+        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})
     </insert>
     <update id="updateNotifyBu">
         update SOIssueNotifyHeader set bu=#{bu} where site=#{site} and NotifyNo=#{notifyNo}
@@ -292,7 +291,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
                 ${query.sql}
             </if>
         </where>
-        order by a.NotifyNo
+        order by a.NotifyNo desc
     </select>
 
     <select id="searchNotifyOrderList" resultType="SOIssueNotifyOrderListData">
@@ -631,4 +630,14 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
         AND C.active = 'Y'
         ORDER BY C.priority
     </select>
+
+    <select id="getWorkCenterList" resultType="com.gaotao.modules.base.entity.WorkCenterData">
+        select
+            site,
+            bu_no,
+            WorkCenterNo,
+            WorkCenterDesc
+        from WorkCenter
+        where site = #{site} and bu_no = #{buNo}
+    </select>
 </mapper>