问题修改

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

@@ -144,7 +144,11 @@ public class DeliveryServiceImpl implements DeliveryService {
         lock.lock();
         try{
             String removalCode = codeGenerateCk();
-            for(AskGoods askGoods : askGoodsMapper.getAskGoodsVitrual(uniqueCode, type)){
+            List<AskGoods> listData = askGoodsMapper.getAskGoodsVitrual(uniqueCode, type);
+            for(AskGoods askGoods : listData){
+                if(!askGoods.getAskGoodsId().equals(deliveryId)){
+                    continue;
+                }
                 askGoods.setStorageCode(removalCode);
                 askGoods.setCompanyNumber(askGoods.getAccountSleeve());
                 //判断物料是否录入
@@ -219,7 +223,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                         //如果单据存在  则继续往下执行
                         if(list2.size() != 0){
                             //修改软件类单据出库数量
-                            deliveryMapper.updateDelivery(map1.get("materialId").toString(), askGoods.getNum(), deliveryId, list2.get(0).getEntryNumber());
+                            deliveryMapper.updateDelivery(list2.get(0).getMaterialId(), askGoods.getNum(), deliveryId, list2.get(0).getEntryNumber());
                             //存入返回GS信息表内
                             ReturRemoval returRemoval = new ReturRemoval()
                                     .setMaterialId(map1.get("materialId").toString())
@@ -244,15 +248,17 @@ public class DeliveryServiceImpl implements DeliveryService {
                         .setStorageLocationCode(askGoods.getStorageLocationCode());
                 askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
             }
-            //新增销售单出库父表信息
-            Delivery delivery = deliveryMapper.getDeliveryF(deliveryId);
-            ReturRemoval returRemoval1 = new ReturRemoval()
-                    .setDocumentId(delivery.getDeliveryId())
-                    .setRemovalCode(removalCode)
-                    .setSourceType(delivery.getSourceType())
-                    .setMoveType(delivery.getMoveType())
-                    .setDeliveryType(delivery.getDeliveryType());
-            askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
+            if(listData.size() != 0){
+                //新增销售单出库父表信息
+                Delivery delivery = deliveryMapper.getDeliveryF(deliveryId);
+                ReturRemoval returRemoval1 = new ReturRemoval()
+                        .setDocumentId(delivery.getDeliveryId())
+                        .setRemovalCode(removalCode)
+                        .setSourceType(delivery.getSourceType())
+                        .setMoveType(delivery.getMoveType())
+                        .setDeliveryType(delivery.getDeliveryType());
+                askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
+            }
             map.put("data", removalCode);
             map.put("msg", "200");
         }catch (Exception e){

src/main/resources/mapper/DeliveryMapper.xml

@@ -361,7 +361,7 @@
             a.software_code as softwareCode,
             b.tld_id as materialId
         from tld_equipment_binding_software a
-        join tld_material b on a.equipment_code = b.code
+        join tld_material b on a.software_code = b.code
         where a.equipment_code = #{code}
     </select>
     <!-- 查询产成品绑定的软件类 -->