交货单接口,移库通知单

src/main/java/com/tld/controller/GsAccessController.java

@@ -118,4 +118,26 @@ public class GsAccessController {
         return inviteService.prodStockInNotice(mapList);
     }
 
+    /**
+     * 交货单接口
+     * @param mapList 参数
+     * @return 返回结果
+     */
+    @PostMapping("deliveryOrder")
+    @PassToken
+    public Map<String, Object> deliveryOrder(@RequestBody List<Map<String,Object>> mapList){
+        return inviteService.deliveryOrder(mapList);
+    }
+
+    /**
+     * 移库通知单
+     * @param mapList 参数
+     * @return 返回结果
+     */
+    @PostMapping("transferNotice")
+    @PassToken
+    public Map<String, Object> transferNotice(@RequestBody List<Map<String,Object>> mapList){
+        return inviteService.transferNotice(mapList);
+    }
+
 }

src/main/java/com/tld/mapper/InviteMapper.java

@@ -74,4 +74,10 @@ public interface InviteMapper {
     void updateOutNum(String num, String askGoodsId, String materialId);
 
     void addNotice(List<Map<String, Object>> List);
+
+    void addDelivery(List<Map<String, Object>> List);
+
+
+    void addWarehouseTransfer(List<Map<String, Object>> List);
+
 }

src/main/java/com/tld/service/InviteService.java

@@ -20,4 +20,8 @@ public interface InviteService {
     Map<String, Object> OutOfLibrary(String uniqueCode, String type, String askGoodsId);
 
     Map<String, Object> prodStockInNotice(List<Map<String, Object>> mapList);
+
+    Map<String, Object> deliveryOrder(List<Map<String, Object>> mapList);
+
+    Map<String, Object> transferNotice(List<Map<String, Object>> mapList);
 }

src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -178,6 +178,10 @@ public class InviteServiceImpl implements InviteService {
         return map;
     }
 
+    /**
+     * 半成品/产成品入库通知
+     * @return
+     */
     @Override
     public Map<String, Object> prodStockInNotice(List<Map<String, Object>> mapList) {
         Map<String, Object> map = new HashMap<>();
@@ -193,6 +197,44 @@ public class InviteServiceImpl implements InviteService {
         return map;
     }
 
+    /**
+     * 交货单接口
+     * @return
+     */
+    @Override
+    public Map<String, Object> deliveryOrder(List<Map<String, Object>> mapList) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            inviteMapper.addDelivery(mapList);
+            map.put("status", "0000");
+            map.put("msg","成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    /**
+     * 移库通知单
+     * @return
+     */
+    @Override
+    public Map<String, Object> transferNotice(List<Map<String, Object>> mapList) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            inviteMapper.addWarehouseTransfer(mapList);
+            map.put("status", "0000");
+            map.put("msg","成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 出库单生成
      * @return

src/main/resources/mapper/InviteMapper.xml

@@ -264,6 +264,56 @@
         </foreach>
         ;
     </insert>
+    <!-- 交货单接口 -->
+    <insert id="addDelivery">
+        insert into tld_delivery_f (delivery_id, delivery_code, company_number, customer_code, bills_time, delivery_type,source_type,move_type)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.deliveryOrderId},#{item.deliveryOrderNo},#{item.companyNumber},#{item.customerNo},#{item.docDate},#{item.deloveryGoodsType},#{item.sourceType},#{item.moveType})
+        </foreach>
+        ;
+        insert into tld_delivery ( delivery_id, entry_number, material_id, wbs, measurement_id, gs_delivery_num, gs_cancel_num, out_num )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.deliveryOrderId},#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.gsDeliveryCount},#{items.gsCancelDeliveryCount},0)
+            </foreach>
+        </foreach>
+        ;
+        insert into tld_delivery_log (delivery_id, delivery_code, company_number, customer_code, bills_time, delivery_type,source_type,move_type, entry_number, material_id, wbs, measurement_id, gs_delivery_num, gs_cancel_num, out_num )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.deliveryOrderId},#{item.deliveryOrderNo},#{item.companyNumber},#{item.customerNo},#{item.docDate},#{item.deloveryGoodsType},#{item.sourceType},#{item.moveType},#{items.entryNumber},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.gsDeliveryCount},#{items.gsCancelDeliveryCount},0)
+            </foreach>
+        </foreach>
+        ;
+    </insert>
+    <!-- 移库通知单 -->
+    <insert id="addWarehouseTransfer">
+        insert into tld_warehouse_transfer_f (warehouse_transfer_id, warehouse_transfer_code, ask_goods_warehouse_id, document_time, warehouse_transfer_type)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.transferNoticeOrderId},#{item.transferNoticeOrderNo},#{item.requestWarehouseId},#{item.docDate},#{item.moveType})
+        </foreach>
+        ;
+        insert into tld_warehouse_transfer ( warehouse_transfer_id, entry_number, supply_warehouse_id, material_id, wbs, measurement_id, num, out_num, type)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.transferNoticeOrderId},#{items.entryNo},#{items.supplyWarehouseId},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+        insert into tld_warehouse_transfer_log (warehouse_transfer_id, warehouse_transfer_code, ask_goods_warehouse_id, document_time, warehouse_transfer_type, entry_number, supply_warehouse_id, material_id, wbs, measurement_id, num, out_num, type)
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            <foreach collection="item.datalist" index="index" item="items" separator=",">
+                (#{item.transferNoticeOrderId},#{item.transferNoticeOrderNo},#{item.requestWarehouseId},#{item.docDate},#{item.moveType},#{items.entryNo},#{items.supplyWarehouseId},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0)
+            </foreach>
+        </foreach>
+        ;
+    </insert>
     <!-- 查询当天出库数量 -->
     <select id="getReturnRemovalCount" resultType="int">
         select count(*) from tld_return_gs_removal where scrq BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59');