Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

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

@@ -11,7 +11,10 @@ import java.util.List;
 public class BussinessInventoryDto implements Serializable {
 
     private String totalNum;
-
+    private String actualNum;
+    private String addNum;
+    private String deleteNum;
+    private String state;
     private List<EquipmentListDto> equipmentList;
 
 }
\ No newline at end of file

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

@@ -5,14 +5,13 @@ import lombok.Data;
 import java.io.Serializable;
 @Data
 public class EquipmentListDto {
-
         private String typeId;
-
         private String typeName;
         private String sizeId;
-
         private String sizeName;
         private String planNum;
-
-
+        private String stockNumber;
+        private String fixNumber;
+        private String num;
+        private String state;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateInventoryReq.java

 package com.junmp.jyzb.api.bean.req;
 
+import com.junmp.jyzb.api.bean.dto.EquipmentListDto;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class UpdateInventoryReq   {
@@ -34,15 +36,14 @@ public class UpdateInventoryReq   {
      */
     @NotBlank(message = "仓库id不能为空", groups = {ValidationApi.edit.class})
     private String warehouseId;
-    /**
-     * 单据单号
-     */
-    private String operator;
 
+    private String operator;
+    private String rulesJson;
     private String inventoryType;
 
     private String rules;
 
     private String ExamineState;
+
 }
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UploadInventoryReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.jyzb.api.bean.dto.EquipmentListDto;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+
+@Data
+public class UploadInventoryReq   {
+    private String orderId;
+    private String totalNum;
+    private String actualNum;
+    private String addNum;
+    private String deleteNum;
+    private String state;
+    private String epcList;
+    private List<EquipmentListDto> equipmentList;
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java

@@ -5,14 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
 import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
-import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
+import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
 import com.junmp.jyzb.entity.BussinessInventory;
-import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.jyzb.service.BussinessInventoryService;
-import com.junmp.jyzb.service.CabinetBoxService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @RestController
 @Slf4j
@@ -57,19 +55,32 @@ public class BussinessInventoryController {
 
         return ApiRes.success(BussinessInventoryService.Check(req));
     }
-    //盘库申请
+    //开始盘点，已废弃
     @PostMapping("/Start")
     @ApiOperation("开始盘点")
     public ApiRes<Boolean> Start (@RequestBody  BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.Start(req));
     }
-    //盘库申请
+    //查询列表
     @PostMapping("/GetPage")
     @ApiOperation("查询列表")
     public ApiRes<PageResult<BussinessInventory>> GetPage (@RequestBody  BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.GetPage(req));
     }
-
+    //盘库申请
+    @PostMapping("/GetById")
+    @ApiOperation("查询详情")
+    public ApiRes<BussinessInventoryDto> GetById (@RequestBody  BussinessInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        return ApiRes.success(BussinessInventoryService.GetDetailById(req));
+    }
+    //盘库申请
+    @PostMapping("/UploadStock")
+    @ApiOperation("上传盘点记录")
+    public ApiRes<Bool> UploadStock (@RequestBody UploadInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        return ApiRes.success(BussinessInventoryService.UploadStock(req));
+    }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/BussinessInventory.java

@@ -106,11 +106,42 @@ public class BussinessInventory implements Serializable {
     private Integer inventoryType;
 
     /**
+     *
+     */
+    @TableField(value = "total_num")
+    private Integer totalNum;
+    /**
+     *
+     */
+    @TableField(value = "actual_num")
+    private Integer actualNum;
+    /**
+     *
+     */
+    @TableField(value = "add_num")
+    private Integer addNum;
+    /**
+     *
+     */
+    @TableField(value = "state")
+    private Integer state;
+    /**
+     *
+     */
+    @TableField(value = "delete_num")
+    private Integer deleteNum;
+    /**
      * 类别
      */
     @TableField(value = "rules")
     private String rules;
     /**
+     * 类别
+     */
+    @TableField(value = "rules_json")
+    private String rulesJson;
+
+    /**
      * 经办人id
      */
     @TableField(value = "result")

jyzb-biz/src/main/java/com/junmp/jyzb/service/BussinessInventoryService.java

@@ -8,6 +8,7 @@ import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
 import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
 import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
+import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
 import com.junmp.jyzb.entity.BusForm;
 import com.junmp.jyzb.entity.BussinessInventory;
 import com.junmp.v2.db.api.page.PageResult;
@@ -26,4 +27,8 @@ public interface BussinessInventoryService extends IService<BussinessInventory>
     Boolean Start(BussinessInventoryReq req);
 
     PageResult<BussinessInventory> GetPage(BussinessInventoryReq req);
+
+    BussinessInventoryDto GetDetailById(BussinessInventoryReq req);
+
+    Bool UploadStock(UploadInventoryReq req);
 }

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

@@ -18,6 +18,7 @@ import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
 import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
+import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
 import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
 import com.junmp.jyzb.entity.*;
@@ -174,11 +175,11 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
                 if (type.equals("1"))//按装备类型盘点
                 {
-                    List<String> typeIds = Arrays.asList(req.getTypeList().split(","));
+                    List<String> typeIds = Arrays.asList(inventory.getRules().split(","));
                     sumreq.setTypeIds(typeIds);
                 } else if (type.equals("2"))//按装备号型盘点
                 {
-                    List<String> sizeIds = Arrays.asList(req.getTypeList().split(","));
+                    List<String> sizeIds = Arrays.asList(inventory.getRules().split(","));
                     sumreq.setSizeIds(sizeIds);
                 }
 
@@ -240,14 +241,48 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
         if (bi!=null)
         {
-            List<BussinessDetail> details = bussinessInventoryDetailService.list(
-                    new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, bi.getId())
-            );
-            bi.setDetailList(details);
+            BussinessInventory inventory= this.getById(orderId);
+            String type=inventory.getInventoryType().toString();//获取盘点类型
+            String warehouseId=inventory.getWarehouseId();
+            InventorySumReq sumreq=new InventorySumReq();
+            sumreq.setLocationType("0");
+            sumreq.setLocationId(warehouseId);
+            BussinessInventoryDto BIDto=new BussinessInventoryDto();
+            List<BussinessDetail> detailList=new ArrayList<>();
+
+            if (type.equals("1"))//按装备类型盘点
+            {
+                List<String> typeIds = Arrays.asList(req.getTypeList().split(","));
+                sumreq.setTypeIds(typeIds);
+            } else if (type.equals("2"))//按装备号型盘点
+            {
+                List<String> sizeIds = Arrays.asList(req.getTypeList().split(","));
+                sumreq.setSizeIds(sizeIds);
+            }
+
+            List<EquipmentListDto> eqList=new ArrayList<>();
+            Integer totalNumber=0;
+            List<InventorySummary> SumResult = inventorySummaryService.getEquipmentInfoList(sumreq);
+            for (InventorySummary summary : SumResult) {
+                BussinessDetail detail=new BussinessDetail();
+                EquipmentListDto eq=new EquipmentListDto();
+                BeanPlusUtil.copyProperties(summary,eq);
+                eq.setPlanNum(String.valueOf(summary.getStockNumber()));
+                totalNumber+=summary.getStockNumber();
+                eqList.add(eq);
+            }
+            BIDto.setTotalNum(String.valueOf(totalNumber));
+            BIDto.setEquipmentList(eqList);
+
+//            List<BussinessDetail> details = bussinessInventoryDetailService.list(
+//                    new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, bi.getId())
+//            );
+
+//            bi.setDetailList(details);
           Warehouse warehouseSet=  warehouseService.getById(bi.getWarehouseId());//先锁库，再下发盘点
           warehouseSet.setIsLocked(true);
           bi.setInventoryState("running");
-
+          warehouseService.updateById(warehouseSet);
           MQ.SendMsg("BussinessInv",warehouseSet.getOrgId().toString(),bi);
         }
         else
@@ -257,6 +292,49 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         }
         return true;
     }
+    @Override
+    public BussinessInventoryDto GetDetailById(BussinessInventoryReq req) {
+        BussinessInventory inventory= this.getById(req.getOrderId());
+        List<BussinessDetail> details = bussinessInventoryDetailService.list(
+                    new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
+            );
+
+    List<EquipmentListDto> eqDtoList=new ArrayList<>();
+        BussinessInventoryDto BIDTO=new BussinessInventoryDto();
+        BeanPlusUtil.copyProperties(inventory,BIDTO);
+        for (BussinessDetail detail : details) {
+            EquipmentListDto eqDto = new EquipmentListDto();
+            // 这里假设 BeanPlusUtil 是你的工具类，使用它进行属性复制
+            BeanPlusUtil.copyProperties(detail, eqDto);
+            eqDtoList.add(eqDto);
+        }
+        BIDTO.setEquipmentList(eqDtoList);
+        return BIDTO;
+    }
+
+    @Override
+    public Bool UploadStock(UploadInventoryReq req) {
+        //更新之前先把库存表的epc备份
+       BussinessInventory BI=  this.getById(req.getOrderId());
+       String type= BI.getInventoryType().toString();
+        InventorySumReq sumreq=new InventorySumReq();
+        if (type.equals("0"))
+        {
+            List<String> typeIds = Arrays.asList(BI.getRules().split(","));
+            sumreq.setTypeIds(typeIds);
+        } else if (type.equals("1"))//按装备类型盘点
+        {
+            List<String> sizeIds = Arrays.asList(BI.getRules().split(","));
+            sumreq.setSizeIds(sizeIds);
+        }
+        else if (type.equals("2"))//按号型盘点
+        {
+            List<String> sizeIds = Arrays.asList(BI.getRules().split(","));
+            sumreq.setSizeIds(sizeIds);
+        }
+        List<InventorySummary> SumResult = inventorySummaryService.getEquipmentInfoList(sumreq);
+        return null;
+    }
 
     @Override
     public PageResult<BussinessInventory> GetPage(BussinessInventoryReq req) {
@@ -279,6 +357,8 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
     }
 
+
+
     /**
      * 设置单据单号
      * 通用方法，根据组织机构id以及业务单据类型来进行设置