问题修改

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

@@ -171,4 +171,8 @@ public interface AskGoodsMapper {
     List<Map<String, Object>> getCreateOtherDeliveryMaterialsParent(@Param("documentId") String documentId);
 
     void updateEnquiryOutNum(AskGoods askGoods);
+
+    List<Map<String, Object>> getGsRemovals(@Param("removalCode") String removalCode);
+
+    List<String> getWarehouseWheres(@Param("removalCode") String removalCode);
 }

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

@@ -737,13 +737,15 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     @Override
     public void CreateBOLOutStock(String removalCode) {
         try{
+            String documentId = null ;
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
-            for(String warehouseWhere : askGoodsMapper.getWarehouseWhere(removalCode)){
+            for(String warehouseWhere : askGoodsMapper.getWarehouseWheres(removalCode)){
                 List<Map<String, Object>> mapList = askGoodsMapper.getGsRemoval(removalCode);
                 if(mapList.size() >0 ) {
                     JSONObject strJson = new JSONObject();
                     //父表
+                    documentId = mapList.get(0).get("askGoodsId").toString();
                     strJson.put("BOLID", mapList.get(0).get("askGoodsId").toString());//要货单id
                     strJson.put("WMSID", mapList.get(0).get("id").toString());//出库单id
                     strJson.put("WMSCode", mapList.get(0).get("removalCode").toString());//出库单编号
@@ -817,8 +819,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 }
             }
             //删除父子表信息
-            askGoodsMapper.delPlugOutRemoval(removalCode);
-            askGoodsMapper.delRemovalz(removalCode);
+            askGoodsMapper.delPlugOutRemoval(documentId);
+            askGoodsMapper.delRemovalz(documentId);
             //添加记录到tld_access
             String names = "销售发货单" ;
             String accessType = "1" ;
@@ -1069,10 +1071,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 }
             }
             //删除父子表信息
-            //根据code
-            askGoodsMapper.delNoticeParent(orderNumber);
-            //根据id
-            askGoodsMapper.delNoticeSubtabulation(orderNumber);
+//            //根据code
+//            askGoodsMapper.delNoticeParent(orderNumber);
+//            //根据id
+//            askGoodsMapper.delNoticeSubtabulation(orderNumber);
             //删除虚拟表
             askGoodsMapper.delReturnGsWarehousing(orderNumber);
             //添加记录到tld_access
@@ -1197,18 +1199,20 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     @Override
     public void CreateOtherDeliveryMaterials(String removalCode) {
         try {
+            String documentId = null ;
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
             LinkedList<String> noticeIds = new LinkedList<>();
             //通过出库单编号查询单据ID
             List<Map<String,Object>> lists = askGoodsMapper.getCreateOtherDeliveryMaterialsWarehouseWhere(removalCode);
             //根据id查询子表的供货仓库
-            //根据仓库循环
+            //根据仓库
             for (Map<String, Object> maps : lists) {
-                List<Map<String, Object>> mapList = askGoodsMapper.getGsRemoval(removalCode);
+                List<Map<String, Object>> mapList = askGoodsMapper.getGsRemovals(removalCode);
                 if(mapList.size() >0 ) {
                     JSONObject strJson = new JSONObject();
                     //父表
+                    documentId = mapList.get(0).get("askGoodsId").toString();
                     strJson.put("GIReqBillID", mapList.get(0).get("askGoodsId").toString());//要货单id
                     strJson.put("WMSID", mapList.get(0).get("id").toString());//出库单id
                     strJson.put("WMSCode", mapList.get(0).get("removalCode").toString());//出库单编号
@@ -1278,8 +1282,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 }
             }
             //删除父子表信息
-            askGoodsMapper.delPlugOutRemoval(removalCode);
-            askGoodsMapper.delRemovalz(removalCode);
+            askGoodsMapper.delPlugOutRemoval(documentId);
+            askGoodsMapper.delRemovalz(documentId);
             //添加记录到tld_access
             String names = "其它出库";
             String accessType = "1";
@@ -1300,6 +1304,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     @Override
     public void CreateOtherDeliveryMaterial(String removalCode) {
         try {
+            String documentId = null ;
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
             LinkedList<String> noticeIds = new LinkedList<>();
@@ -1308,10 +1313,11 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             //根据id查询子表的供货仓库
             //根据仓库循环
             for (Map<String, Object> maps : lists) {
-                List<Map<String, Object>> mapList = askGoodsMapper.getGsRemoval(removalCode);
+                List<Map<String, Object>> mapList = askGoodsMapper.getGsRemovals(removalCode);
                 if(mapList.size() >0 ) {
                     JSONObject strJson = new JSONObject();
                     //父表
+                    documentId = mapList.get(0).get("askGoodsId").toString();
                     strJson.put("GIReqBillID", mapList.get(0).get("askGoodsId").toString());//要货单id
                     strJson.put("WMSID", mapList.get(0).get("id").toString());//出库单id
                     strJson.put("WMSCode", mapList.get(0).get("removalCode").toString());//出库单编号
@@ -1381,8 +1387,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 }
             }
             //删除父子表信息
-            askGoodsMapper.delPlugOutRemoval(removalCode);
-            askGoodsMapper.delRemovalz(removalCode);
+            askGoodsMapper.delPlugOutRemoval(documentId);
+            askGoodsMapper.delRemovalz(documentId);
             //添加记录到tld_access
             String names = "其它出库";
             String accessType = "1";

src/main/resources/mapper/AskGoodsMapper.xml

@@ -1336,6 +1336,25 @@
             ifnull(product_code, '')      as productCode,
         from tld_enquiry_f where ask_goods_id = #{documentId}
     </select>
+    <!--其他发货父表信息-->
+    <select id="getGsRemovals" resultType="java.util.Map">
+        select id,
+               document_id  as askGoodsId,
+               removal_code as removalCode,
+               source_type  as sourceType,
+               move_type    as moveType,
+               scrq
+        from tld_return_gs_removal
+        where removal_code = #{removalCode}
+    </select>
+    <!--销售发货单接口查询仓库-->
+    <select id="getWarehouseWheres" resultType="java.lang.String">
+        SELECT DISTINCT b.warehouse_where as warehouseWhere
+        FROM tld_return_gs_removal_z a
+        JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
+        join tld_return_gs_removal c on a.document_id = c.document_id
+        WHERE c.removal_code = #{removalCode}
+    </select>
     <!-- 修改数据传输状态 -->
     <update id="updateRemoval">
         update tld_removal set transmission_type = "1" where storage_code = #{removalCode}