调整盘点单据

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentListDto.java

@@ -15,6 +15,7 @@ public class EquipmentListDto {
         private String planNum;
         private String stockNumber;
         private String fixNumber;
+        private BigDecimal fixPrice;
         private String num;
         private String state;
         private String price;

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -293,7 +293,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                     if (Type.equals("stocktakeOrder"))//整理需要下发的消息
                     {
                         sendReq.setMsgTitle("盘点提醒");
-                        sendReq.setMsgContent("【盘库单】已下发");
+                        sendReq.setMsgContent("盘库单:【"+mainProcess.getName()+"】已下发");
                     }
                     else
                     {

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java

@@ -31,7 +31,10 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
     List<InventoryMapDto> GetViewInventoryMap(@Param("warehouseId") String warehouseId);
 
     Boolean deleteByEpcs(@Param("list") List<String> epcs);
-    List<InvSummaryDto>  selectWarehouseByEpcs(@Param("list") List<String> epcs,@Param("orgId") String orgId);
+
+    Boolean DeleteEpcsWithoutWarehouse(@Param("list") List<String> epcs,@Param("orgId") String orgId,@Param("warehouseId") String warehouseId);
+
+    List<InvSummaryDto>  selectWarehouseByEpcs(@Param("list") List<String> epcs,@Param("orgId") String orgId,@Param("warehouseId") String warehouseId);
 
     //根据单警柜统计装备信息
     boolean SetCabinetInventory(@Param("brokenNumberDays") Integer brokenNumberDays);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -78,6 +78,8 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     @Resource
     private WarehouseInventoryService warehouseInventoryService;
     @Resource
+    private LogSummaryService logSummaryService;
+    @Resource
     private InventoryService inventoryService;
 
     @Resource
@@ -519,6 +521,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 BeanPlusUtil.copyProperties(detail, eqDto);
                 eqDto.setNum(Integer.valueOf(priceEq.getNum()));
                 eqDto.setPrice(priceEq.getPrice());
+                eqDto.setFixPrice(detail.getFixPrice());
                 eqDto.setStockPrice(priceEq.getStockPrice());
                 eqDto.setAccountNum(String.valueOf(priceEq.getAccountNumber()));
                 eqDto.setInventoryId(Long.valueOf(req.getOrderId()));
@@ -590,7 +593,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         InventorySumReq sumreq=new InventorySumReq();
         sumreq.setLocationType("0");
         sumreq.setLocationId(BI.getWarehouseId());
-
+//            logSummaryService.processInventoryRecords()
         if (BI.getInventoryType().equals(1))//按装备类型盘点
         {
             List<String> typeIds = Arrays.asList(BI.getRules().split(","));
@@ -615,20 +618,21 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                         summary.setStockNumber(bussiness.getFixNumber());
                         summary.setOutboundNumber(0);
                         summary.setNumber(bussiness.getFixNumber());
-                        if (bussiness.getState().equals(1))//盈余状态需要增加金额和数量
+                        if (bussiness.getState().equals("1"))//盈余状态需要增加金额和数量
                         {
-                            summary.setPrice( summary.getPrice().add(bussiness.getFixPrice()));
-                            bussiness.setStockPrice(summary.getStockNumberPrice());
+                            summary.setPrice( bussiness.getFixPrice());
+//                            bussiness.setStockPrice(summary.getStockNumberPrice());
                         }
-                        else if (bussiness.getState().equals(2))//亏损状态需要减少金额和数量
+                        else if (bussiness.getState().equals("2"))//亏损状态需要减少金额和数量
                         {
-                            BigDecimal fixPriceNew=summary.getPrice().subtract(bussiness.getFixPrice());
-                            int i = fixPriceNew.compareTo(BigDecimal.ZERO);
-                            if (i == -1) {
-                                summary.setPrice(BigDecimal.ZERO);
-                            } else if (i == 1||i == 0) {
-                                summary.setPrice( fixPriceNew);
-                            }
+                            summary.setPrice( bussiness.getFixPrice());
+//                            BigDecimal fixPriceNew=summary.getPrice().subtract(bussiness.getFixPrice());
+//                            int i = fixPriceNew.compareTo(BigDecimal.ZERO);
+//                            if (i == -1) {
+//                                summary.setPrice(BigDecimal.ZERO);
+//                            } else if (i == 1||i == 0) {
+//                                summary.setPrice( fixPriceNew);
+//                            }
 
                         }
 
@@ -777,7 +781,8 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 UpdateInventorys = new ArrayList<>(Collections.singletonList(epcUpdate));
             }
             //需要对Summary表得数据进行更新
-          List<InvSummaryDto> Summary=inventoryMapper.selectWarehouseByEpcs(UpdateInventorys, String.valueOf(BI.getOrgId()));//删除同组织机构下EPC所在
+          List<InvSummaryDto> Summary=inventoryMapper.selectWarehouseByEpcs(UpdateInventorys, String.valueOf(BI.getOrgId()),String.valueOf(BI.getWarehouseId()));//删除同组织机构下EPC所在
+
             List<InventorySummary> UpdateSummary=new ArrayList<>();
             List<InventorySummary> DeleteSummary=new ArrayList<>();
             for (InvSummaryDto Isum:Summary) {
@@ -794,10 +799,10 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                     BigDecimal price = Isum.getPrice();
                     BigDecimal result = count.multiply(price);
                     BigDecimal currentPrice=InvSum.getPrice().subtract(result);//当前价格
-                    InvSum.setPrice(currentPrice);
-                    InvSum.setNumber(currentNumber);
-                    InvSum.setStockNumber(currentNumber);
-                    InvSum.setStockNumberPrice(currentPrice);
+                    InvSum.setPrice(currentPrice.max(BigDecimal.ZERO));
+                    InvSum.setNumber(Math.max(currentNumber, 0));
+                    InvSum.setStockNumber(Math.max(currentNumber, 0));
+                    InvSum.setStockNumberPrice(currentPrice.max(BigDecimal.ZERO));
                     InvSum.setUpdateTime(DateTimeUtil.getCurrentDateTime());
                     if (InvSum.getStockNumber()==0&&InvSum.getNumber()==0&&InvSum.getFixNumber()==0&&InvSum.getBrokenNumber()==0&&InvSum.getDestructionNumber()==0&&InvSum.getOutboundNumber()==0)
                     {
@@ -807,6 +812,8 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                     {
                         UpdateSummary.add(InvSum);
                     }
+                    //这里还要记上出入库的日志，用来记录原有物资减少的变化
+
 
                 }
 
@@ -841,8 +848,9 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             }
             BI.setInventoryState("close");
             BI.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-
-            if (DeleteList.size()>0)
+            //删除同组织机构下该EPC其他仓库的位置信息
+            inventoryMapper.DeleteEpcsWithoutWarehouse(UpdateInventorys, String.valueOf(BI.getOrgId()),String.valueOf(BI.getWarehouseId()));
+            if (DeleteList.size()>0)//删除库内全部的EPC信息
             {
                 warehouseInventoryService.removeBatchByIds(DeleteList);
             }
@@ -851,20 +859,21 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             {
                 inventorySummaryService.removeBatchByIds(DeleteSummary);
             }
-            if (UpdateSummary.size()>0)
+            if (UpdateSummary.size()>0)//同组织机构的其他不同仓库的物资
             {
                 inventorySummaryService.updateBatchById(UpdateSummary);
             }
-            if (SaveEpcList.size()>0)
+            if (SumResult.size()>0)//当前组织机构盘点后的物资汇总信息
             {
-                warehouseInventoryService.saveBatch(SaveEpcList);
+                inventorySummaryService.updateBatchById(SumResult);
             }
-            this.updateById(BI);
-            if (SumResult.size()>0)
+            if (SaveEpcList.size()>0)//将新的库内EPC存入新仓库
             {
-                inventorySummaryService.updateBatchById(SumResult);
+                warehouseInventoryService.saveBatch(SaveEpcList);
             }
-            if (InsertSumResult.size()>0)
+
+
+            if (InsertSumResult.size()>0)//当前仓库下没有该物资，需要新增该物资的信息
             {
                 inventorySummaryService.saveBatch(InsertSumResult);
             }
@@ -879,6 +888,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             Warehouse warehouse= warehouseService.getById(BI.getWarehouseId());
             warehouse.setIsLocked(0);
             warehouseService.updateById(warehouse);
+            this.updateById(BI);
         }
         else//废除单据   req.getState().equals(1)
         {

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -108,6 +108,18 @@
         </foreach>
     </delete>
 
+    <delete id="DeleteEpcsWithoutWarehouse" parameterType="java.util.List">
+        DELETE bwi
+        FROM `base_warehouse_inventory` bwi
+        WHERE bwi.epc IN
+        <foreach item="item" index="index" collection="list"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND bwi.org_id = #{orgId}
+        AND bwi.location_id != #{warehouseId}
+    </delete>
+
     <select id="selectWarehouseByEpcs" resultType="com.junmp.jyzb.api.bean.dto.InvSummaryDto">
         SELECT
         bi.type_id as typeId,
@@ -124,7 +136,7 @@
                  open="(" separator="," close=")">
             #{item}
         </foreach>
-        and bwi.org_id=#{orgId}
+        and bwi.org_id=#{orgId} and bwi.location_id!=#{warehouseId}
         GROUP BY
         bi.size_id, bi.type_id, bi.price,bwi.location_id
     </select>