问题修改

src/main/java/com/tld/config/MyRedissonConfig.java

@@ -16,8 +16,8 @@ public class MyRedissonConfig {
     public RedissonClient redissonClient(){
         // 创建配置 指定redis地址及节点信息
         Config config = new Config();
-        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
-//        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
+//        config.useSingleServer().setAddress("redis://8.142.144.205:6379").setPassword("#09SilverB");
+        config.useSingleServer().setAddress("redis://10.2.111.91:6379").setPassword("#09SilverB");
         //redis集群使用
 //        config.useClusterServers().addNodeAddress("redis://8.142.144.205:6379");
         // 根据config创建出RedissonClient实例

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

@@ -53,7 +53,7 @@ public interface AskGoodsMapper {
 
     String getMaterialId(@Param("wllbCode") String wllbCode);
 
-    AskGoods getAskDetailed(String askGoodsId, String materialId);
+    AskGoods getAskDetailed(@Param("askGoodsId") String askGoodsId, @Param("materialId") String materialId, @Param("entryNumber")String entryNumber);
 
     void addReturnGsRemoval(ReturRemoval returRemoval);
 

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

@@ -56,7 +56,7 @@ public interface InviteMapper {
 
     String getMaterialId(@Param("wllbCode") String wllbCode);
 
-    AskGoods getAskDetailed(String askGoodsId, String materialId);
+    AskGoods getAskDetailed(@Param("askGoodsId") String askGoodsId, @Param("materialId") String materialId, @Param("entryNumber")String entryNumber);
 
     void addReturnGsRemoval(ReturRemoval returRemoval);
 

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

@@ -17,7 +17,7 @@ public interface WarehouseTransferMapper {
 
     AskGoods getAsk(Inventory inventory);
 
-    WarehouseTransfer getWarehouseTransferDetailed(String askGoodsId, String materialId);
+    WarehouseTransfer getWarehouseTransferDetailed(@Param("askGoodsId")String askGoodsId, @Param("materialId")String materialId, @Param("entryNumber")String entryNumber);
 
     void updateOutNum(@Param("num")String num, @Param("askGoodsId")String askGoodsId, @Param("materialId")String materialId, @Param("typeVal")String typeVal);
 

src/main/java/com/tld/model/WarehousingVirtual.java

@@ -160,5 +160,9 @@ public class WarehousingVirtual implements Serializable {
      * 采购数量
      */
     private String purchaseNum;
+    /**
+     * 分录号
+     */
+    private String entryNumber;
 
 }

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

@@ -255,7 +255,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     askGoodsMapper.updateInventory(inventory);
                 }
                 String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode());//查询物料id
-                AskGoods askGoods1 = askGoodsMapper.getAskDetailed(askGoodsId, materialId);//查询要料申请单内容
+                AskGoods askGoods1 = askGoodsMapper.getAskDetailed(askGoodsId, materialId, askGoods.getEntryNumber());//查询要料申请单内容
                 ReturRemoval returRemoval = new ReturRemoval()
                         .setMaterialId(materialId)
                         .setDocumentId(askGoodsId)

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

@@ -166,7 +166,8 @@ public class DeliveryServiceImpl implements DeliveryService {
                     askGoodsMapper.updateInventory(inventory);
                 }
                 //查询销售单部分信息
-                Delivery delivery = new Delivery().setDeliveryId(deliveryId).setMaterialId(materialClass.getTldId());
+                Delivery delivery = new Delivery().setDeliveryId(deliveryId).setMaterialId(materialClass.getTldId())
+                        .setEntryNumber(askGoods.getEntryNumber());
                 List<Delivery> list = deliveryMapper.getDelivery(delivery);
                 deliveryMapper.updateDelivery(materialClass.getTldId(), askGoods.getNum(), deliveryId); //修改销售单出库数量
                 if(materialClass.getPartType().equals("产成品")){

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

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

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

@@ -113,16 +113,16 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
                    receiveGoods.setType("0");
                    //存在一个采购单发送多次的情况  如果是一个采购单多次传输 则改变原数据的数量
                    ReceiveGoods receiveGoods1 = new ReceiveGoods().setOrderCode(receiveGoods.getOrderCode()).setMaterialId(receiveGoods.getMaterialId()).setWbs(receiveGoods.getWbs()).setCompanyNumber(receiveGoods.getCompanyNumber());
-                   List<ReceiveGoods> listRepeat = receiveGoodsMapper.getReceiveGoods(receiveGoods1);
-                   if (listRepeat.size() != 0) {
-                       receiveGoods.setArrivalNum(String.valueOf(Integer.parseInt(listRepeat.get(0).getArrivalNum()) + Integer.parseInt(receiveGoods.getArrivalNum())));
-                       receiveGoodsMapper.updateReceiveGoods(receiveGoods);
-                   } else {
+//                   List<ReceiveGoods> listRepeat = receiveGoodsMapper.getReceiveGoods(receiveGoods1);
+//                   if (listRepeat.size() != 0) {
+//                       receiveGoods.setArrivalNum(String.valueOf(Integer.parseInt(listRepeat.get(0).getArrivalNum()) + Integer.parseInt(receiveGoods.getArrivalNum())));
+//                       receiveGoodsMapper.updateReceiveGoods(receiveGoods);
+//                   } else {
                        if (receiveGoodsMapper.getReceiveGoodsf(receiveGoods1) == 0) {
                            receiveGoodsMapper.addReceiveGoodsf(receiveGoods);
                        }
                        receiveGoodsMapper.addReceiveGoods(receiveGoods);
-                   }
+//                   }
                    receiveGoodsMapper.updatePurchaseType(receiveGoods);
                    //采购单日志
                    receiveGoodsMapper.addReceiveGoodsLog(receiveGoods);

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

@@ -108,7 +108,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                     askGoodsMapper.updateInventory(inventory);
                 }
                 String materialId = askGoodsMapper.getMaterialId(askGoods.getWllbCode());//查询物料id
-                WarehouseTransfer warehouseTransfer = warehouseTransferMapper.getWarehouseTransferDetailed(askGoodsId, materialId);//查询移库申请内容
+                WarehouseTransfer warehouseTransfer = warehouseTransferMapper.getWarehouseTransferDetailed(askGoodsId, materialId, askGoods.getEntryNumber());//查询移库申请内容
                 //入库流水信息
                 WarehousingVirtual WarehousingVirtual1 = new WarehousingVirtual()
                         .setWllbCode(askGoods.getWllbCode()) //物料code
@@ -215,7 +215,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                 MaterialClass material = warehousingMapper.getMaterial(notice);
                 //查询采购单信息
                 String materialId = askGoodsMapper.getMaterialId(warehousingVirtual.getWllbCode());//查询物料id
-                WarehouseTransfer warehouseTransfer = warehouseTransferMapper.getWarehouseTransferDetailed(warehousingVirtual.getWarehouseTransferId(), materialId);//查询移库申请内容
+                WarehouseTransfer warehouseTransfer = warehouseTransferMapper.getWarehouseTransferDetailed(warehousingVirtual.getWarehouseTransferId(), materialId, warehousingVirtual.getEntryNumber());//查询移库申请内容
                 if(warehouseTransfer != null) {
                     //WBS
                     warehousingVirtual.setWbs(warehouseTransfer.getWbs());

src/main/resources/mapper/AskGoodsMapper.xml

@@ -127,10 +127,10 @@
     <insert id="addAskGoodsVitrual">
         insert into tld_ask_goods_vitrual(unique_code, supplier_id, serial, wllb_code, produc_date, ask_goods_id, type,
                                           storage_location_code, num, user_id, department, attribute, account_sleeve,
-                                          storage_location_code_rk, wbs)
+                                          storage_location_code_rk, wbs, entry_number)
         values (#{uniqueCode}, #{supplierId}, #{serial}, #{wllbCode}, #{producDate}, #{askGoodsId}, #{type},
                 #{storageLocationCode}, #{num}, #{userId}, #{department}, #{attribute}, #{companyNumber},
-                #{storageLocationCodeRk}, #{wbs})
+                #{storageLocationCodeRk}, #{wbs}, #{entryNumber})
     </insert>
     <!-- 查询指定库存内容 -->
     <select id="getInventory" resultType="com.tld.model.Inventory">
@@ -276,7 +276,8 @@
                department,
                account_sleeve,
                wbs,
-               storage_location_code_rk
+               storage_location_code_rk,
+               entry_number
         from tld_ask_goods_vitrual
         where unique_code = #{uniqueCode}
           and type = #{type}
@@ -327,6 +328,9 @@
         from tld_ask_goods
         where ask_goods_id = #{askGoodsId}
           and material_id = #{materialId}
+        <if test="entryNumber != null and entryNumber != ''">
+            and entry_number = #{entryNumber}
+        </if>
     </select>
     <!-- 新增返回gs数据字表信息 -->
     <insert id="addReturnGsRemoval">
@@ -558,7 +562,8 @@
                department,
                account_sleeve,
                wbs,
-               attribute
+               attribute,
+               entry_number
         from tld_ask_goods_vitrual
         where unique_code = #{uniqueCode}
           and type = #{type}
@@ -1188,7 +1193,7 @@
             a.storage_location_code as storageLocationCode,
             b.warehouse_where as warehouseWhere
         FROM tld_return_gs_warehousing a
-                 JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
+        JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
         WHERE a.storage_code = #{removalCode}
         group by b.warehouse_where
     </select>

src/main/resources/mapper/DeliveryMapper.xml

@@ -10,7 +10,7 @@
             b.delivery_code,
             a.entry_number,
             a.material_id,
-            a.wbs,
+            d.code as wbs,
             a.measurement_id,
             a.gs_delivery_num,
             a.gs_cancel_num,
@@ -27,6 +27,7 @@
         from tld_delivery a
         join tld_delivery_f b on a.delivery_id = b.delivery_id
         left join tld_material c on a.material_id = c.tld_id
+        left join tld_wbs d on a.wbs = d.tld_id
         where (a.gs_delivery_num - a.gs_cancel_num) != a.out_num
         and a.status != '1'
         <if test="deliveryId != null and deliveryId != ''">
@@ -35,6 +36,9 @@
         <if test="materialId != null and materialId != ''">
             and a.material_id = #{materialId}
         </if>
+        <if test="entryNumber != null and entryNumber != ''">
+            and a.entry_number = #{entryNumber}
+        </if>
     </select>
     <!-- 查询所有产成品库位 -->
     <select id="getStorageLocationCodeList" resultType="String">

src/main/resources/mapper/InviteMapper.xml

@@ -121,10 +121,10 @@
     <insert id="addAskGoodsVitrual">
         insert into tld_ask_goods_vitrual(unique_code, supplier_id, serial, wllb_code, produc_date, ask_goods_id, type,
                                           storage_location_code, num, user_id, department, attribute, account_sleeve,
-                                          storage_location_code_rk, wbs)
+                                          storage_location_code_rk, wbs, entry_number)
         values (#{uniqueCode}, #{supplierId}, #{serial}, #{wllbCode}, #{producDate}, #{askGoodsId}, #{type},
                 #{storageLocationCode}, #{num}, #{userId}, #{department}, #{attribute}, #{companyNumber},
-                #{storageLocationCodeRk}, #{wbs})
+                #{storageLocationCodeRk}, #{wbs}, #{entryNumber})
     </insert>
     <!-- 查询指定库存内容 -->
     <select id="getInventory" resultType="com.tld.model.Inventory">
@@ -222,7 +222,8 @@
                department,
                account_sleeve,
                wbs,
-               storage_location_code_rk
+               storage_location_code_rk,
+               entry_number
         from tld_ask_goods_vitrual where unique_code = #{uniqueCode} and type = #{type} and ask_goods_id = #{askGoodsId}
     </select>
     <!-- 删除库存 -->
@@ -269,6 +270,9 @@
             out_num
         from tld_invite
         where ask_goods_id = #{askGoodsId} and material_id = #{materialId}
+        <if test="entryNumber != null and entryNumber != ''">
+            and entry_number = #{entryNumber}
+        </if>
     </select>
     <!-- 新增返回gs数据字表信息 -->
     <insert id="addReturnGsRemoval">

src/main/resources/mapper/ReceiveGoodsMapper.xml

@@ -16,7 +16,8 @@
         a.disqualification_num,
         a.arrival_time,
         b.code as wllbCode,
-        a.wbs,
+--         a.wbs,
+        g.code as wbs,
         e.company_number as companyNumber,
         e.supplier_id as supplierId,
         p.name as compName
@@ -25,6 +26,7 @@
         left join tld_customer c on a.supplier_id = c.code
         left join tld_receive_goods_f e on a.order_code = e.order_code
         left join tld_company p on e.company_number = p.code
+        left join tld_wbs g on a.wbs = g.tld_id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="materialId != null and materialId != ''">
                 and a.material_id like CONCAT(CONCAT('%',#{materialId},'%'))

src/main/resources/mapper/WarehouseTransferMapper.xml

@@ -102,6 +102,9 @@
         from tld_warehouse_transfer a
         join tld_warehouse_transfer_f b on a.warehouse_transfer_id = b.warehouse_transfer_id
         where a.warehouse_transfer_id = #{askGoodsId} and a.material_id = #{materialId}
+        <if test="entryNumber != null and entryNumber != ''">
+            and entry_number = #{entryNumber}
+        </if>
     </select>
     <!-- 修改出库数量 -->
     <update id="updateOutNum">

src/main/resources/mapper/WarehousingMapper.xml

@@ -27,10 +27,10 @@
     <insert id="addWarehousingVirtual">
         insert into tld_warehousing_virtual(unique_code, num, storage_location_code, wllb_code, supp_id, serial, type,
                                             produc_date, capacity, seq, user_id, storage_location_name, attribute,
-                                            notice_id, warehouse_transfer_id, storage_location_code_ck,wbs, receive_goods_id, account_sleeve)
+                                            notice_id, warehouse_transfer_id, storage_location_code_ck,wbs, receive_goods_id, account_sleeve, entry_number)
         values (#{uniqueCode}, #{num}, #{storageLocationCode}, #{wllbCode}, #{suppId}, #{serial}, #{type},
                 #{producDate}, #{capacity}, #{seq}, #{userId}, #{storageLocationName}, #{attribute}, #{noticeId},
-                #{warehouseTransferId}, #{storageLocationCodeCk},#{wbs},#{receiveGoodsId},#{accountSleeve})
+                #{warehouseTransferId}, #{storageLocationCodeCk},#{wbs},#{receiveGoodsId},#{accountSleeve}, #{entryNumber})
     </insert>
     <!-- 查询总数量 -->
     <select id="getScanNum" resultType="java.util.Map">
@@ -104,7 +104,8 @@
             a.receive_goods_id,
             a.wbs,
             a.account_sleeve,
-            a.warehouse_transfer_id
+            a.warehouse_transfer_id,
+            a.entry_number
         from tld_warehousing_virtual a
         left join tld_user b on a.user_id = b.id
         where a.unique_code = #{uniqueCode} and a.type = #{type}