瀏覽代碼

问题修改

zhs 2 年之前
父節點
當前提交
1a6c2a102d

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

@@ -42,4 +42,6 @@ public interface WarehouseTransferMapper {
     List<Inventory> getMaterialWarehouseTransfer(AskGoods askGoods);
 
     Inventory getInventoryVitrual(AskGoods askGoods);
+
+    String getWarehouseTransferCodeType(String askGoodsWarehouseId);
 }

+ 18 - 8
src/main/java/com/tld/service/impl/WarehouseTransferServiceImpl.java

@@ -139,19 +139,29 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                 warehouseTransferMapper.updateOutNum(askGoods.getNum(), askGoodsId, materialId, typeVal);//修改出库数量
                 if(askGoods.getStorageLocationCodeRk().indexOf("XNKW") != -1){
                     Inventory inventory2 = warehouseTransferMapper.getInventoryVitrual(askGoods);
-                    if(inventory2 != null ){
-                        Inventory inventory1 = new Inventory()
-                                .setNum(askGoods.getNum())
-                                .setMaterialId(materialId)
-                                .setStorageLocationCode(askGoods.getStorageLocationCodeRk());
-                        warehousingMapper.updateVitrualNum(inventory1);
-                    } else {
+                    String code = warehouseTransferMapper.getWarehouseTransferCodeType(warehouseTransfer.getAskGoodsWarehouseId());
+                    if(material.getPartType().equals("产成品") && code.equals("2")){
                         //入库信息
                         List<WarehousingVirtual> warehousingVal = new LinkedList<>();
                         WarehousingVirtual warehousingVirtual = warehousing.get(warehousing.size() - 1);
-                        warehousingVirtual.setSuppId("").setSerial("");
+                        warehousingVirtual.setSuppId("");
                         warehousingVal.add(warehousingVirtual);
                         warehousingMapper.addInventory(warehousingVal);//库存
+                    } else {
+                        if(inventory2 != null ){
+                            Inventory inventory1 = new Inventory()
+                                    .setNum(askGoods.getNum())
+                                    .setMaterialId(materialId)
+                                    .setStorageLocationCode(askGoods.getStorageLocationCodeRk());
+                            warehousingMapper.updateVitrualNum(inventory1);
+                        } else {
+                            //入库信息
+                            List<WarehousingVirtual> warehousingVal = new LinkedList<>();
+                            WarehousingVirtual warehousingVirtual = warehousing.get(warehousing.size() - 1);
+                            warehousingVirtual.setSuppId("").setSerial("");
+                            warehousingVal.add(warehousingVirtual);
+                            warehousingMapper.addInventory(warehousingVal);//库存
+                        }
                     }
                 }
                 WarehouseTransfer warehouseTransfer1 = new WarehouseTransfer()

+ 9 - 0
src/main/resources/mapper/WarehouseTransferMapper.xml

@@ -225,4 +225,13 @@
             and wbs = #{wbs}
         </if>
     </select>
+    <!-- 查询是否是借件库 -->
+    <select id="getWarehouseTransferCodeType" resultType="String">
+        SELECT
+            ifnull(warehouse_type, "10") as warehouseType
+        FROM
+            tld_warehouse
+        WHERE
+            tld_id = #{askGoodsWarehouseId}
+    </select>
 </mapper>