问题修改

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

@@ -51,7 +51,7 @@ public interface AskGoodsMapper {
 
     void addRemoval(AskGoods askGoods);
 
-    String getMaterialId(String wllbCode);
+    String getMaterialId(@Param("wllbCode") String wllbCode, @Param("accountSleeve") String accountSleeve);
 
     AskGoods getAskDetailed(String askGoodsId, String materialId);
 

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

@@ -4,6 +4,7 @@ import com.tld.model.AskGoods;
 import com.tld.model.Inventory;
 import com.tld.model.ReturRemoval;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -53,7 +54,7 @@ public interface InviteMapper {
 
     void updateInventory(Inventory inventory);
 
-    String getMaterialId(String wllbCode);
+    String getMaterialId(@Param("wllbCode") String wllbCode, @Param("accountSleeve") String accountSleeve);
 
     AskGoods getAskDetailed(String askGoodsId, String materialId);
 

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

@@ -218,7 +218,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     inventory.setAmount(askGoods.getNum());
                     askGoodsMapper.updateInventory(inventory);
                 }
-                String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode());//查询物料id
+                String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode(), askGoods.getAccountSleeve());//查询物料id
                 AskGoods askGoods1 = askGoodsMapper.getAskDetailed(askGoodsId, materialId);//查询要料申请单内容
                 ReturRemoval returRemoval = new ReturRemoval()
                         .setMaterialId(materialId)
@@ -242,7 +242,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     .setSourceType(askGoods3.getSourceType())
                     .setMoveType(askGoods3.getMoveType());
             askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
-            map.put("data", removalCode);
+            map.put("data", askGoods3.getAskGoodsId());
             map.put("msg", "200");
         }catch (Exception e){
             e.printStackTrace();

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

@@ -86,7 +86,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                     inventory.setAmount(askGoods.getNum());
                     askGoodsMapper.updateInventory(inventory);
                 }
-                String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode());//查询物料id
+                String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode(), askGoods.getAccountSleeve());//查询物料id
                 deliveryMapper.updateDelivery(materialId, askGoods.getNum(), deliveryId); //修改销售单出库数量
                 //查询销售单部分信息
                 Delivery delivery = new Delivery().setDeliveryId(deliveryId).setMaterialId(materialId);

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

@@ -143,7 +143,7 @@ public class InviteServiceImpl implements InviteService {
                     inventory.setAmount(askGoods.getNum());
                     inviteMapper.updateInventory(inventory);
                 }
-                String materialId = inviteMapper.getMaterialId(askGoods.getWllbCode());//查询物料id
+                String materialId = inviteMapper.getMaterialId(askGoods.getWllbCode(), askGoods.getAccountSleeve());//查询物料id
                 AskGoods askGoods1 = inviteMapper.getAskDetailed(askGoodsId, materialId);//查询要料申请单内容
                 ReturRemoval returRemoval = new ReturRemoval()
                         .setMaterialId(materialId)

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

@@ -98,7 +98,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                     inventory.setAmount(askGoods.getNum());
                     askGoodsMapper.updateInventory(inventory);
                 }
-                String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode());//查询物料id
+                String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode(), askGoods.getAccountSleeve());//查询物料id
                 WarehouseTransfer warehouseTransfer = warehouseTransferMapper.getWarehouseTransferDetailed(askGoodsId, materialId);//查询移库申请内容
 //                //入库流水信息
 //                WarehousingVirtual WarehousingVirtual1 = new WarehousingVirtual()
@@ -159,7 +159,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
             //查询入库所需要的信息
             for(WarehousingVirtual warehousingVirtual : warehousingVirtualList) {
                 //查询采购单信息
-                String materialId = askGoodsMapper.getMaterialId(warehousingVirtual.getWllbCode());//查询物料id
+                String materialId = askGoodsMapper.getMaterialId(warehousingVirtual.getWllbCode(), warehousingVirtual.getAccountSleeve());//查询物料id
                 WarehouseTransfer warehouseTransfer = warehouseTransferMapper.getWarehouseTransferDetailed(warehousingVirtual.getWarehouseTransferId(), materialId);//查询移库申请内容
                 if(warehouseTransfer != null) {
                     //WBS

src/main/resources/mapper/AskGoodsMapper.xml

@@ -179,7 +179,8 @@
             storage_location_code,
             num,
             user_id,
-            department
+            department,
+            account_sleeve
         from tld_ask_goods_vitrual where unique_code = #{uniqueCode} and type = #{type} and ask_goods_id = #{askGoodsId}
     </select>
     <!-- 删除库存 -->
@@ -204,7 +205,7 @@
     </insert>
     <!-- 查询指定物料类型的id -->
     <select id="getMaterialId" resultType="String">
-        select tld_id from tld_material where code = #{wllbCode}
+        select tld_id from tld_material where code = #{wllbCode} and company_number = #{accountSleeve}
     </select>
     <!-- 查询要料申请单内容 -->
     <select id="getAskDetailed" resultType="com.tld.model.AskGoods">

src/main/resources/mapper/InviteMapper.xml

@@ -52,7 +52,6 @@
             JOIN tld_invite_f b ON a.ask_goods_id = b.ask_goods_id
             LEFT JOIN tld_department c ON b.department = c.code
             JOIN tld_material e ON a.material_id = e.tld_id
-
         WHERE
                 ( a.num + 0 ) <![CDATA[>]]> (
                 IFNULL( a.out_num, 0 ) + 0) and e.part_type != '半成品' and e.part_type != '产成品'
@@ -190,7 +189,8 @@
             storage_location_code,
             num,
             user_id,
-            department
+            department,
+            account_sleeve
         from tld_ask_goods_vitrual where unique_code = #{uniqueCode} and type = #{type} and ask_goods_id = #{askGoodsId}
     </select>
     <!-- 删除库存 -->
@@ -215,7 +215,7 @@
     </insert>
     <!-- 查询指定物料类型的id -->
     <select id="getMaterialId" resultType="String">
-        select tld_id from tld_material where code = #{wllbCode}
+        select tld_id from tld_material where code = #{wllbCode} and company_number = #{accountSleeve}
     </select>
     <!-- 查询要料申请单内容 -->
     <select id="getAskDetailed" resultType="com.tld.model.AskGoods">