1.修复库存养护，设备领用等功能的bug

src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java

@@ -51,7 +51,7 @@ public class InvCountCodesController {
     @PostMapping("/inv/count/codes/deleteCode")
     public BaseResponse deleteCode(@RequestBody FilterInvCountCodesRequest codesRequest) {
         if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getRelId()) || StrUtil.isBlank(codesRequest.getCode())) {
-            return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL);
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
         return invCountCodesService.deleteCode(codesRequest);
     }

src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java

@@ -11,6 +11,7 @@ import java.util.Date;
 @Data
 @TableName(value = "inv_prein_order")
 public class InvPreinOrderEntity {
+
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -20,6 +21,12 @@ public class InvPreinOrderEntity {
     @TableField(value = "billNo")
     private String billNo;
 
+    /**
+     * 单据类型
+     */
+    @TableField(value = "action")
+    private String action;
+
     /**
      * 往来单位
      */

src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java

@@ -69,7 +69,7 @@ public class InvPreinOrderResponse {
      */
     private String remark;
 
-    private String billTypeNames;
+    private String billTypeName;
     private String createUserName;
     private String updateUserName;
     private String reviewUserName;

src/main/java/com/glxp/api/service/inout/IoGenInvService.java

@@ -8,7 +8,6 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;

src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java

@@ -106,6 +106,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
                 filterInvProductDetailRequest.setBatchNo(invProductEntity.getBatchNo());
                 filterInvProductDetailRequest.setDeptCode(invProductEntity.getDeptCode());
                 filterInvProductDetailRequest.setInvCode(invProductEntity.getInvCode());
+                filterInvProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode());
                 List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetailList(filterInvProductDetailRequest);
                 //计算出在仓库中的设备
                 //提取库存详情中不同的码

src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java

@@ -72,6 +72,21 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
 
         //将此单据详情的盘点数量 - 1
         invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() - udiCalCountUtil.getActCount(udi.getUdi()));
+        //盘点数量删减之后，重新计算盈亏状态
+        int diff = invCountOrderDetail.getInvNum() - invCountOrderDetail.getCountNum();
+        if (diff > 0) {
+            invCountOrderDetail.setLossNum(Math.abs(diff));
+            //盘亏
+            invCountOrderDetail.setStatus(0);
+        } else if (diff < 0) {
+            invCountOrderDetail.setProfitNum(Math.abs(diff));
+            //盘盈
+            invCountOrderDetail.setStatus(1);
+        } else {
+            //平衡
+            invCountOrderDetail.setStatus(2);
+        }
+        //更新盘点单据详情
         invCountOrderDetailDao.updateById(invCountOrderDetail);
         return ResultVOUtils.success();
     }

src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java

@@ -73,7 +73,7 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
         //查询单据信息
         InvCountOrderEntity invCountOrder = invCountOrderDao.selectByOrderId(invCountOrderDetail.getOrderIdFk());
         InvProductEntity invProductEntity = invProductDao.selectProductInfo(invCountOrderDetail.getRelId(), invCountOrderDetail.getBatchNo(), invCountOrder.getDeptCode(), invCountOrder.getInvCode(), invCountOrder.getInvSpaceCode());
-        invCountOrderDetail.setInvNum(invProductEntity.getInCount() - invProductEntity.getOutCount());
+        invCountOrderDetail.setInvNum(invProductEntity.getReCount());
         invCountOrderDetail.setCountNum(0);
         invCountOrderDetailDao.insert(invCountOrderDetail);
         return ResultVOUtils.success();

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -209,7 +209,7 @@
                basic_products.ggxh,
                inv_product.inCount,
                inv_product.outCount,
-               sum(inv_product.inCount - inv_product.outCount) reCount,
+               inv_product.reCount,
                basic_products.cpmctymc
         from inv_product_detail
                  left join inv_product on inv_product_detail.relId = inv_product.relIdFk