xiaochen 2 anni fa
parent
commit
a86b396a92

+ 1 - 3
src/main/java/com/tld/controller/GsAccessController.java

@@ -51,7 +51,7 @@ public class GsAccessController {
     }
 
     /**
-     * 采购到料信息大屏/采购订单接口
+     * 采购到料信息大屏/采购订单接口/GS采购订单数据对接
      * @param jsonData 参数
      * @return 返回结果
      */
@@ -140,6 +140,4 @@ public class GsAccessController {
         return inviteService.transferNotice(mapList);
     }
 
-
-
 }

+ 2 - 0
src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -143,4 +143,6 @@ public interface AskGoodsMapper {
     void delNoticeParent(@Param("orderNumber") String orderNumber);
 
     void delNoticeSubtabulation(@Param("orderNumber") String orderNumber);
+
+    String getAmount(AskGoods goods);
 }

+ 4 - 0
src/main/java/com/tld/mapper/QueryListMapper.java

@@ -51,4 +51,8 @@ public interface QueryListMapper {
     List<Map<String, Object>> onOffExcel(Access access);
 
     List<Map<String, Object>> getLogDataExcel(LogData logData);
+
+    String getAmount(AskGoods goods);
+
+    String getAmounts(Delivery delivery1);
 }

+ 16 - 0
src/main/java/com/tld/model/AskGoods.java

@@ -232,4 +232,20 @@ public class AskGoods implements Serializable {
      * 公司名称
      */
     private String accountName;
+    /**
+     * 要货申请类型编号
+     */
+    private String requestTypeNumber;
+    /**
+     * 要货申请类型名称
+     */
+    private String requestTypeName;
+    /**
+     * 退换货(0正常1退货2换货)
+     */
+    private String ifCommodity;
+    /**
+     * 库存数量
+     */
+    private String amount;
 }

+ 4 - 0
src/main/java/com/tld/model/Delivery.java

@@ -131,4 +131,8 @@ public class Delivery implements Serializable {
      * 物料类型
      */
     private String partType;
+    /**
+     * 库存数量
+     */
+    private String amount;
 }

+ 15 - 0
src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -40,6 +40,14 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     @Autowired
     private DictionaryMapper dictionaryMapper;
 
+    /**
+    * @Description: 要货申请单(生产领用申请)
+    * @Param: mapList
+    * @return: Map<String, Object> 成功失败状态
+    * @Author: XiaoChen
+    * @Date: 2023/4/10
+    */
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> addAskGoods(List<Map<String,Object>> mapList) {
@@ -59,6 +67,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     ag.setDepartmentId(jsonMap.get("useDepartment").toString());
                     ag.setSourceType(jsonMap.get("sourceType").toString());
                     ag.setMoveType(jsonMap.get("moveType").toString());
+                    ag.setRequestTypeNumber(jsonMap.get("requestTypeNumber").toString());
+                    ag.setRequestTypeName(jsonMap.get("requestTypeName").toString());
+                    ag.setIfCommodity(jsonMap.get("ifCommodity").toString());
 
                     //子表
                     ag.setType("0");
@@ -444,6 +455,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             //查询数据
             PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
             PageInfo<AskGoods> list = new PageInfo<>(askGoodsMapper.getGoodsHalf(askGoods));
+            for (AskGoods goods : list.getList()) {
+                String amount = askGoodsMapper.getAmount(goods);
+                goods.setAmount(amount);
+            }
             map.put("data", list);
             map.put("msg", "200");
         }catch (Exception e){

+ 10 - 2
src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -311,7 +311,13 @@ public class InviteServiceImpl implements InviteService {
         return (stringBuilder.append(count + 1)).toString();
     }
 
-
+    /**
+    * @Description: 非生产领用
+    * @Param: List<Map<String,Object>> mapList
+    * @return: Map<String, Object> map
+    * @Author: XiaoChen
+    * @Date: 2023/4/10
+    */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList) {
@@ -331,7 +337,9 @@ public class InviteServiceImpl implements InviteService {
                     ag.setDepartment(jsonMap.get("useDepartment").toString());
                     ag.setSourceType(jsonMap.get("sourceType").toString());
                     ag.setMoveType(jsonMap.get("moveType").toString());
-                    ag.setAskGoodsApplyType(jsonMap.get("requestOrderType").toString());
+                    ag.setRequestTypeNumber(jsonMap.get("requestTypeNumber").toString());
+                    ag.setRequestTypeName(jsonMap.get("requestTypeName").toString());
+                    ag.setIfCommodity(jsonMap.get("ifCommodity").toString());
                     //子表
                     ag.setEntryNumber(element.get("entryNumber").toString());
                     ag.setProductionCode(element.get("prodOrderNo").toString());//

+ 12 - 0
src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -138,6 +138,10 @@ public class QueryListServiceImpl implements QueryListService {
         try{
             PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
             PageInfo<AskGoods> list = new PageInfo<>(queryListMapper.getAskGoods(askGoods));
+            for (AskGoods goods : list.getList()) {
+                String amount = queryListMapper.getAmount(goods);
+                goods.setAmount(amount);
+            }
             map.put("data", list);
             map.put("msg", "200");
         } catch (Exception e){
@@ -180,6 +184,10 @@ public class QueryListServiceImpl implements QueryListService {
         try{
             PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
             PageInfo<AskGoods> list = new PageInfo<>(queryListMapper.getInvite(askGoods));
+            for (AskGoods goods : list.getList()) {
+                String amount = queryListMapper.getAmount(goods);
+                goods.setAmount(amount);
+            }
             map.put("data", list);
             map.put("msg", "200");
         } catch (Exception e){
@@ -222,6 +230,10 @@ public class QueryListServiceImpl implements QueryListService {
         try{
             PageHelper.startPage(delivery.getPage(), delivery.getLimit());
             PageInfo<Delivery> list = new PageInfo<>(queryListMapper.getDelivery(delivery));
+            for (Delivery delivery1 : list.getList()) {
+                String amount = queryListMapper.getAmounts(delivery1);
+                delivery1.setAmount(amount);
+            }
             map.put("data", list);
             map.put("msg", "200");
         } catch (Exception e){

+ 8 - 4
src/main/resources/mapper/AskGoodsMapper.xml

@@ -27,10 +27,10 @@
     <insert id="addAskGoodsLog">
         insert into tld_ask_goods_log(ask_goods_id, entry_number, production_code, material_id, wbs, measurement_id,
                                       num, out_num, ask_goods_code, company_number, sqrq, department_id, source_type,
-                                      move_type, ask_goods_type)
+                                      move_type, ask_goods_type,request_type_number,request_type_name,if_commodity)
         values (#{askGoodsId}, #{entryNumber}, #{productionCode}, #{materialId}, #{wbs}, #{measurementId}, #{num},
                 #{outNum}, #{askGoodsCode}, #{companyNumber}, #{sqrq}, #{departmentId}, #{sourceType}, #{moveType},
-                #{askGoodsType})
+                #{askGoodsType},#{requestTypeNumber},#{requestTypeName},#{ifCommodity})
     </insert>
     <!-- 查询次要货单是否存在 -->
     <select id="getAskGoodsf" resultType="int">
@@ -42,8 +42,8 @@
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsf">
         insert into tld_ask_goods_f(ask_goods_id, ask_goods_code, company_number, sqrq, department, source_type,
-                                    move_type)
-        values (#{askGoodsId}, #{askGoodsCode}, #{companyNumber}, #{sqrq}, #{departmentId}, #{sourceType}, #{moveType})
+                                    move_type,request_type_number,request_type_name,if_commodity)
+        values (#{askGoodsId}, #{askGoodsCode}, #{companyNumber}, #{sqrq}, #{departmentId}, #{sourceType}, #{moveType},#{requestTypeNumber},#{requestTypeName},#{ifCommodity})
     </insert>
     <!-- 查询生产领料单 -->
     <select id="getAskGoodsfList" resultType="com.tld.model.AskGoods">
@@ -1144,4 +1144,8 @@
         left join tld_wbs b on a.wbs = b.tld_id
         where a.notice_id = #{orderNumber}
     </select>
+    <!--查询库存数量-->
+    <select id="getAmount" resultType="java.lang.String">
+        select ifnull(sum(amount),'0') as amount from tld_inventory where wbs = #{wbs} and account_sleeve = #{companyNumber} and wllb_code = #{materialCode}
+    </select>
 </mapper>

+ 6 - 0
src/main/resources/mapper/DictionaryMapper.xml

@@ -30,6 +30,9 @@
             <if test="code != null and code != ''">
                 and code like CONCAT(CONCAT('%', #{code}), '%')
             </if>
+            <if test="nameOrCode != null and nameOrCode != ''">
+                and (code like CONCAT(CONCAT('%', #{nameOrCode}), '%') or name like CONCAT(CONCAT('%', #{nameOrCode}), '%'))
+            </if>
             <if test="tldId != null and tldId != ''">
                 and tld_id = #{tldId}
             </if>
@@ -339,6 +342,9 @@
             <if test="name != null and name != ''">
                 and name like CONCAT(CONCAT('%', #{name}), '%')
             </if>
+            <if test="nameOrCode != null and nameOrCode != ''">
+                and (code like CONCAT(CONCAT('%', #{nameOrCode}), '%') or name like CONCAT(CONCAT('%', #{nameOrCode}), '%'))
+            </if>
         </trim>
     </select>
     <!-- 修改物料字典内容 -->

+ 8 - 8
src/main/resources/mapper/InviteMapper.xml

@@ -20,13 +20,13 @@
     </insert>
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsf">
-        insert into tld_invite_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type,ask_goods_apply_type)
-        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType},#{askGoodsApplyType})
+        insert into tld_invite_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type,request_type_number,request_type_name,if_commodity)
+        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType},#{requestTypeNumber},#{requestTypeName},#{ifCommodity})
     </insert>
     <!-- 新增要料日志 -->
     <insert id="addAskGoodsLog">
-        insert into tld_ask_goods_log(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_code,company_number,sqrq,department_id,source_type,move_type,ask_goods_type)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{outNum},#{askGoodsCode},#{companyNumber},#{sqrq},#{departmentId},#{sourceType},#{moveType},#{askGoodsType})
+        insert into tld_ask_goods_log(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_code,company_number,sqrq,department_id,source_type,move_type,ask_goods_type,request_type_number,request_type_name,if_commodity)
+        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{outNum},#{askGoodsCode},#{companyNumber},#{sqrq},#{departmentId},#{sourceType},#{moveType},#{askGoodsType},#{requestTypeNumber},#{requestTypeName},#{ifCommodity})
     </insert>
     <!-- 查询次要货单是否存在 -->
     <select id="getAskGoodsf" resultType="int">
@@ -278,10 +278,10 @@
     </insert>
     <!-- 半成品/产成品入库通知 -->
     <insert id="addNotice">
-        insert into tld_notice_f (notice_id, notice_code, company_number, notice_time, source_type, move_type)
+        insert into tld_notice_f (notice_id, notice_code, company_number, notice_time, source_type, move_type,notification_type_number,notification_type_name)
         values
         <foreach collection="list" index="index" item="item" separator=",">
-            (#{item.stockInNoticeId},#{item.stockInNoticeNo},#{item.companyNo},#{item.noticeDate},#{item.sourceType},#{item.moveType})
+            (#{item.stockInNoticeId},#{item.stockInNoticeNo},#{item.companyNo},#{item.noticeDate},#{item.sourceType},#{item.moveType},#{item.notificationTypeNumber},#{item.notificationTypeName})
         </foreach>
         ;
         insert into tld_notice ( notice_id, entry_number, production_code, material_id, wbs, measurement_id, num, type, warehousing_num )
@@ -292,11 +292,11 @@
             </foreach>
         </foreach>
         ;
-        insert into tld_notice_log (notice_id, notice_code, company_number, notice_time, source_type, move_type,entry_number, production_code, material_id, wbs, measurement_id, num, type, warehousing_num)
+        insert into tld_notice_log (notice_id, notice_code, company_number, notice_time, source_type, move_type,notification_type_number,notification_type_name,entry_number, production_code, material_id, wbs, measurement_id, num, type, warehousing_num)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             <foreach collection="item.datalist" index="index" item="items" separator=",">
-                (#{item.stockInNoticeId},#{item.stockInNoticeNo},#{item.companyNo},#{item.noticeDate},#{item.sourceType},#{item.moveType},#{items.entryNumber},#{items.prodOrderNo},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+                (#{item.stockInNoticeId},#{item.stockInNoticeNo},#{item.companyNo},#{item.noticeDate},#{item.sourceType},#{item.moveType} ,#{item.notificationTypeNumber},#{item.notificationTypeName} ,#{items.entryNumber},#{items.prodOrderNo},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
             </foreach>
         </foreach>
         ;

+ 11 - 1
src/main/resources/mapper/QueryListMappeer.xml

@@ -136,7 +136,9 @@
         </trim>
         GROUP BY
         a.storage_location_code,
-        a.material_id
+        a.material_id,
+        a.wbs ,
+        a.account_sleeve
     </select>
     <!-- 查询库位信息 -->
     <select id="getQueryInventory" resultType="java.util.Map">
@@ -924,5 +926,13 @@
         </trim>
         ORDER BY a.scrq DESC
     </select>
+    <!--查询库存数量-->
+    <select id="getAmount" resultType="java.lang.String">
+        select ifnull(sum(amount),'0') as amount from tld_inventory where wbs = #{wbs} and account_sleeve = #{companyNumber} and wllb_code = #{materialCode}
+    </select>
+    <!--查询库存数量-->
+    <select id="getAmounts" resultType="java.lang.String">
+        select ifnull(sum(amount),'0') as amount from tld_inventory where wbs = #{wbs} and account_sleeve = #{companyNumber} and wllb_code = #{materialCode}
+    </select>
 
 </mapper>

+ 2 - 2
src/main/resources/mapper/WarehousingMapper.xml

@@ -272,7 +272,7 @@
                 and a.account_sleeve = #{accountSleeve}
             </if>
         </trim>
-        order by scrq desc
+        order by a.scrq desc
     </select>
     <!-- 查询虚拟入库 -->
     <select id="getWarehousingVirtual" resultType="com.tld.model.WarehousingVirtual">
@@ -711,7 +711,7 @@
     </update>
     <!-- 新增半成品流水 -->
     <insert id="addRemovalHalfProduct">
-        insert into tld_removal_half_product(wllb_code, num, user_id, scrq, ask_goods_id, department, storage_code, wbs, company_number)
+        insert into tld_removal_half_product(wllb_code, num, user_id, scrq, ask_goods_id, department, storage_code, wbs, account_sleeve)
             value (#{wllbCode},#{num},#{userId},now(),#{askGoodsId},#{department},#{storageCode},#{wbs},#{companyNumber})
     </insert>
     <!-- 查询指定物料内容 -->