首次提交

src/main/java/com/xujie/sys/modules/orderIssure/controller/IssureNotifyController.java

@@ -5,6 +5,7 @@ import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.common.utils.R;
 import com.xujie.sys.modules.orderIssure.entity.*;
 import com.xujie.sys.modules.orderIssure.service.IssureNotifyService;
+import com.xujie.sys.modules.orderIssure.vo.IssueNotifyChangeLog;
 import com.xujie.sys.modules.orderIssure.vo.SOIssueNotifyOrderList;
 import com.xujie.sys.modules.part.vo.AgentInformationVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +90,22 @@ public class IssureNotifyController {
         return R.ok().put("rows", rows);
     }
 
+    /**
+     * @Description 查看其他已申请物料
+     * @Title searchOtherPart
+      * @param data
+     * @author rq
+     * @date 2024/10/28 9:49
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/searchOtherPart")
+    @ResponseBody
+    public R searchOtherPart(@RequestBody SOIssueNotifyOrderMaterialListData data) {
+        List<SOIssueNotifyOrderMaterialListData> rows  = issureNotifyService.searchOtherPart(data);
+        return R.ok().put("rows", rows);
+    }
+
     /**
      * @Description 保存申请单派工单记录
      * @Title saveSOIssueNotifyOrderList
@@ -181,14 +198,42 @@ public class IssureNotifyController {
         List<SOIssueNotifyOrderMaterialListData> rows  = issureNotifyService.searchSumNotifyMaterialList(data);
         return R.ok().put("rows", rows);
     }
-
+    /*
+     * @Description 非BOM物料
+     * @Title getNoControlPartList
+     * @param data
+     * @author rq
+     * @date 2024/10/28 9:36
+     * @return R
+     * @throw
+     */
     @PostMapping(value="/getPartList")
     @ResponseBody
     public R getPartList(@RequestBody PartData data) {
         List<PartData> rows  = issureNotifyService.getPartList(data);
         return R.ok().put("rows", rows);
     }
-
+    /**
+     * @Description 不管控物料
+     * @Title getNoControlPartList
+      * @param data
+     * @author rq
+     * @date 2024/10/28 9:36
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/getNoControlPartList")
+    @ResponseBody
+    public R getNoControlPartList(@RequestBody PartData data) {
+        List<PartData> rows  = issureNotifyService.getNoControlPartList(data);
+        return R.ok().put("rows", rows);
+    }
+    @PostMapping(value="/searchNotifyLog")
+    @ResponseBody
+    public R searchNotifyLog(@RequestBody IssueNotifyChangeLog data) {
+        List<IssueNotifyChangeLog> rows  = issureNotifyService.searchIssueNotifyChangeLog(data);
+        return R.ok().put("rows", rows);
+    }
 
     @PostMapping(value = "/checkPartStock")
     @ResponseBody

src/main/java/com/xujie/sys/modules/orderIssure/mapper/IssureNotifyMapper.java

@@ -71,7 +71,7 @@ public interface IssureNotifyMapper {
     List<SOIssueNotifyOrderMaterialListData> getSOSBOMForIssure(SOScheduledRoutingData data);
 
     Double getNextItemForSOIssueNotifyOrderList(SOIssueNotifyOrderList data);
-
+    List<SOIssueNotifyOrderMaterialListData> searchOtherPart(SOIssueNotifyOrderMaterialListData data);
     void saveSOIssueNotifyOrderList(SOIssueNotifyOrderList data);
 
     void deleteSOIssueNotifyOrderMaterialListData(SOIssueNotifyOrderMaterialListData data);
@@ -93,6 +93,7 @@ public interface IssureNotifyMapper {
     List<SOIssueNotifyOrderMaterialListData> searchSumNotifyMaterialList(SOIssueNotifyHeaderData data);
 
     List<PartData> getPartList(PartData data);
+
     List<PartData> getNoControlPartList(PartData data);
 
     List<SOIssueNotifyOrderMaterialListData> checkPartStock(SOIssueNotifyHeaderData data);
@@ -114,4 +115,6 @@ public interface IssureNotifyMapper {
 
     String getNextBomItemNo(SOIssueNotifyOrderMaterialListData data);
 
+    List<IssueNotifyChangeLog> searchIssueNotifyChangeLog(IssueNotifyChangeLog data);
+
 }

src/main/java/com/xujie/sys/modules/orderIssure/service/IssureNotifyService.java

@@ -2,6 +2,7 @@ package com.xujie.sys.modules.orderIssure.service;
 
 import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.modules.orderIssure.entity.*;
+import com.xujie.sys.modules.orderIssure.vo.IssueNotifyChangeLog;
 import com.xujie.sys.modules.orderIssure.vo.SOIssueNotifyOrderList;
 import com.xujie.sys.modules.part.vo.AgentInformationVo;
 
@@ -66,7 +67,7 @@ public interface IssureNotifyService {
      * @throw
      */
     List<SOIssueNotifyOrderMaterialListData> getSOSBOMForIssure(SOScheduledRoutingData data);
-
+    List<SOIssueNotifyOrderMaterialListData> searchOtherPart(SOIssueNotifyOrderMaterialListData data);
     /**
      * @Description 保存派工单子明细
      * @Title saveSOIssueNotifyOrderList
@@ -118,4 +119,10 @@ public interface IssureNotifyService {
 
     void saveOtherPart(SOIssueNotifyOrderMaterialListData data);
 
+
+    List<PartData> getNoControlPartList(PartData data);
+
+
+    List<IssueNotifyChangeLog> searchIssueNotifyChangeLog(IssueNotifyChangeLog data);
+
 }

src/main/java/com/xujie/sys/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java

@@ -93,6 +93,10 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
     public List<SOIssueNotifyOrderMaterialListData> getSOSBOMForIssure(SOScheduledRoutingData data){
         return issureNotifyMapper.getSOSBOMForIssure(data);
     }
+    @Override
+    public List<SOIssueNotifyOrderMaterialListData> searchOtherPart(SOIssueNotifyOrderMaterialListData data){
+        return issureNotifyMapper.searchOtherPart(data);
+    }
 
     @Override
     public Double saveSOIssueNotifyOrderList(SOIssueNotifyOrderList data){
@@ -236,4 +240,14 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
         data.setbOMItemNo(nextBomItemNo);
         issureNotifyMapper.saveSOIssueNotifyOrderMaterialListData(data);
     }
+
+    @Override
+    public  List<PartData> getNoControlPartList(PartData data){
+        return issureNotifyMapper.getNoControlPartList(data);
+    }
+
+    @Override
+    public List<IssueNotifyChangeLog> searchIssueNotifyChangeLog(IssueNotifyChangeLog data){
+        return issureNotifyMapper.searchIssueNotifyChangeLog(data);
+    }
 }

src/main/java/com/xujie/sys/modules/orderIssure/vo/IssueNotifyChangeLog.java

@@ -1,7 +1,8 @@
 package com.xujie.sys.modules.orderIssure.vo;
 
-import java.util.Date;
+import org.apache.ibatis.type.Alias;
 
+import java.util.Date;
 public class IssueNotifyChangeLog {
     /**
      *

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

@@ -113,8 +113,14 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
 
 
     </select>
+
+    <select id="searchOtherPart" resultType="SOIssueNotifyOrderMaterialListData">
+      select NotifyNo,Site,ItemNo,BOMItemNo,ComponentPartNo,QtyToIssue,QtyToIssue_Original,issueType
+      ,dbo.Get_PartDesc(site,ComponentPartNo) partDesc
+      from SOIssueNotifyOrderMaterialList where NotifyNo=#{notifyNo}  and site=#{site} and issueType=#{issueType}
+    </select>
     <select id="getNextItemForSOIssueNotifyOrderList"  resultType="Double">
-        select isnull(max(ItemNo),0)+1 from SOIssueNotifyOrderList where site=#{site} and NotifyNo=#{notifyNo}
+        select isnull(max(ItemNo),0)+1 from SOIssueNotifyOrderList where site=#{site} and NotifyNo=#{notifyNo} and 998>ItemNo
     </select>
 
     <insert id="saveSOIssueNotifyOrderList">
@@ -220,7 +226,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
         select top 1000 part_no,part_desc,umid,spec,sku,cinv_source_code
         from part
          <where>
-            and site = #{site} and sourceBu = #{sourceBu}
+            and site = #{site} and sourceBu = #{sourceBu}   and control_mes='G'
             <if test="partNo != null and partNo != ''">
                 AND part_no LIKE '%'+ #{partNo} + '%'
             </if>
@@ -288,8 +294,8 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
         and ItemNo=#{itemNo} and BOMItemNo=#{bOMItemNo}
     </select>
     <insert id="saveIssueNotifyChangeLog">
-        insert into IssueNotifyChangeLog (Site,NotifyNo,ItemNo,SOOrderNo,SeqNo,ComponentPartNo,QtyToIssue,updateType,updateBy,updateDate)
-        values (#{site},#{notifyNo},#{itemNo},#{sOOrderNo},#{seqNo},#{componentPartNo},#{qtyToIssue,jdbcType=DOUBLE},#{updateType},#{updateBy},#{updateDate})
+        insert into IssueNotifyChangeLog (Site,NotifyNo,ItemNo,SOOrderNo,SeqNo,ComponentPartNo,QtyToIssue,updateType,updateBy,updateDate,issueType)
+        values (#{site},#{notifyNo},#{itemNo},#{sOOrderNo},#{seqNo},#{componentPartNo},#{qtyToIssue,jdbcType=DOUBLE},#{updateType},#{updateBy},#{updateDate},#{issueType})
     </insert>
 
     <select id="getSOIssueNotifyOrderListData" resultType="com.xujie.sys.modules.orderIssure.vo.SOIssueNotifyOrderList">
@@ -299,7 +305,8 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
     </select>
 
     <select id="checkOtherPart" resultType="SOIssueNotifyOrderMaterialListData">
-          select NotifyNo,Site,ItemNo,BOMItemNo,ComponentPartNo,QtyToIssue,QtyToIssue_Original
+      select NotifyNo,Site,ItemNo,BOMItemNo,ComponentPartNo,QtyToIssue,QtyToIssue_Original
+
        from SOIssueNotifyOrderMaterialList where Site=#{site} and NotifyNo=#{notifyNo}
         and ComponentPartNo=#{componentPartNo}
     </select>
@@ -307,11 +314,16 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
     <select id="getNextBomItemNo" resultType="String">
 
         SELECT   #{str}+
-        CONVERT(VARCHAR(50),isnull( max(CONVERT(int,SUBSTRING(BOMItemNo, LEN(#{str}), LEN(BOMItemNo)))+1),1))
+        CONVERT(VARCHAR(50),isnull( max(CONVERT(int,SUBSTRING(BOMItemNo, LEN(#{str})+1, LEN(BOMItemNo)))+1),1))
 
 
         FROM SOIssueNotifyOrderMaterialList where Site=#{site} and NotifyNo=#{notifyNo}
         and BOMItemNo like #{str}+'%'
 
     </select>
+
+    <select id="searchIssueNotifyChangeLog" resultType="com.xujie.sys.modules.orderIssure.vo.IssueNotifyChangeLog">
+        select Site,NotifyNo,ItemNo,SOOrderNo,SeqNo,ComponentPartNo,QtyToIssue,updateType,updateBy,updateDate,issueType
+        from IssueNotifyChangeLog where Site=#{site} and NotifyNo=#{notifyNo}
+    </select>
 </mapper>