Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -384,7 +384,7 @@ public class IoCodeTempController extends BaseController {
         String orderId = addOrderRequest.getBillNo();
 
         //三期校验
-        if (addOrderRequest.isCodeFillCheck()) {
+        if (bussinessTypeEntity.isCodeFillCheck()) {
 
             BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
             if (checkOriginCodeRes != null) {
@@ -455,7 +455,7 @@ public class IoCodeTempController extends BaseController {
                     if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
                         IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code);
                         if (codeTempEntity != null) {
-                            if (invProductDetailEntity.getCount() < (codeTempEntity.getCount() + 1)) {
+                            if (invProductDetailEntity.getCount() < (codeTempEntity.getMyCount() + 1)) {
                                 return ResultVOUtils.error(500, "超出预验收库存数量");
                             }
                         }
@@ -502,8 +502,8 @@ public class IoCodeTempController extends BaseController {
                 genDetaiEntity.setCount(1);
                 genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
 
-                exitLocalEntity.setCount(exitLocalEntity.getCount() + 1);
+                exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
-                exitLocalEntity.setReCount(exitLocalEntity.getCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
+                exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
 
                 BaseResponse invRes = checkInv(bussinessTypeEntity, exitLocalEntity);
                 if (invRes != null) {
@@ -558,7 +558,7 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "该产品不允许以使用单元入库！");
                 }
                 //计算实际数量
-                codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(udiRelevanceResponse));
+                codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponse));
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
                     return ResultVOUtils.error(500, "耗材字典不存在此产品！");
@@ -786,7 +786,7 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
                 } else {
                     //查询此单据已扫描的条码数量
-                    if (codeTempEntity.getReCount() >= count) {
+                    if (codeTempEntity.getMyReCount() >= count) {
                         return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
                     }
                 }
@@ -855,8 +855,9 @@ public class IoCodeTempController extends BaseController {
 
         IoCodeTempEntity codeTempEntity = codeTempService.selectById(id);
         IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
-        if (codeTempEntity.getCount() > 1) {
+        if (codeTempEntity.getMyCount() > 1) {
-            codeTempEntity.setCount(codeTempEntity.getCount() - 1);
+            codeTempEntity.setCount(codeTempEntity.getMyCount() - 1);
+            codeTempEntity.setReCount(codeTempEntity.getMyCount() - udiCalCountUtil.getActCount(codeTempEntity.getRelId()));
             codeTempService.updateById(codeTempEntity);
         } else {
             codeTempService.deleteById(id);
@@ -869,8 +870,8 @@ public class IoCodeTempController extends BaseController {
             int orderCount = orderDetailCodeEntity.getCount();
             int orderReCount = orderDetailCodeEntity.getReCount();
             if (orderCount > 1) {
-                orderDetailCodeEntity.setCount(orderCount - codeTempEntity.getCount());
+                orderDetailCodeEntity.setCount(orderCount - codeTempEntity.getMyCount());
-                orderDetailCodeEntity.setReCount(orderReCount - codeTempEntity.getReCount());
+                orderDetailCodeEntity.setReCount(orderReCount - codeTempEntity.getMyReCount());
                 ioOrderDetailCodeService.update(orderDetailCodeEntity);
             } else {
                 ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId());
@@ -908,7 +909,7 @@ public class IoCodeTempController extends BaseController {
                 }
             }
         }
-        if (codeTempEntity.getCount() <= 0) {
+        if (codeTempEntity.getMyCount() <= 0) {
             return ResultVOUtils.error(500, "数量不能小于0");
         }
         int b = codeTempService.updateById(codeTempEntity);

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -158,7 +158,7 @@ public class IoOrderController extends BaseController {
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
 
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
-            return ResultVOUtils.error(500, "单据还未扫码！");
+            return ResultVOUtils.error(500, "单据未扫码或扫码异常，请检查后重新提交！");
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
         ioAddInoutService.dealProcess(orderEntity);

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -137,7 +137,7 @@ public class IoOrderReviewController extends BaseController {
             for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) {
                 if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() &&
                         StrUtil.trimToEmpty(orderDetailResultResponse.getBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getBatchNo()))) {
-                    orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + codeEntity.getReCount());
+                    orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + codeEntity.getMyReCount());
                     if (orderDetailResultResponse.getAcceptCount() > orderDetailResultResponse.getCount()) {
                         return ResultVOUtils.error(500, "数量溢出！");
                     }
@@ -278,11 +278,11 @@ public class IoOrderReviewController extends BaseController {
         for (IoCodeEntity checkOrderCodesBean : codesList) {
             if (checkOrderCodesBean.getCode().toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
                 if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED
-                        && checkOrderCodesBean.getCount() == checkOrderCodesBean.getScanCount()) {
+                        && checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) {
                     return Constant.CHECK_REPEAT;
                 }
-                int curCount = checkOrderCodesBean.getScanCount() + checkOrderCodesBean.getCount();
+                int curCount = checkOrderCodesBean.getScanCount() + checkOrderCodesBean.getMyCount();
-                if (curCount == checkOrderCodesBean.getCount()) {
+                if (curCount == checkOrderCodesBean.getMyCount()) {
                     checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
                 }
                 checkOrderCodesBean.setScanCount(curCount);

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

@@ -73,7 +73,7 @@ public class InvProductController {
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();
         pageResponse.setList(pageInfo.getList());
-        pageResponse.setTotal(pageResponse.getTotal());
+        pageResponse.setTotal(pageInfo.getTotal());
         pageResponse.setShowSup(showSup);
         return ResultVOUtils.success(pageResponse);
     }

src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java

@@ -104,7 +104,6 @@ public class IoCodeEntity {
      */
     @TableField(value = "reCount")
     private Integer reCount;
-
     /**
      * 部门编码外键
      */
@@ -140,4 +139,18 @@ public class IoCodeEntity {
     @TableField(exist = false)
     private int scanCount;
 
+
+    public int getMyCount() {
+        if (count == null)
+            return 0;
+        return count;
+    }
+
+    public int getMyReCount() {
+        if (reCount == null) {
+            return 0;
+        }
+        return reCount;
+    }
+
 }

src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java

@@ -97,13 +97,13 @@ public class IoCodeTempEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private int count;
+    private Integer count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private int reCount;
+    private Integer reCount;
 
     /**
      * 部门编码外键
@@ -140,5 +140,17 @@ public class IoCodeTempEntity {
     @TableField(exist = false)
     private String mySupId;     //更新供应商
 
+    public int getMyCount() {
+        if (count == null)
+            return 0;
+        return count;
+    }
+
+    public int getMyReCount() {
+        if (reCount == null) {
+            return 0;
+        }
+        return reCount;
+    }
 
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -271,5 +271,7 @@ public class BussinessTypeSaveRequest {
      */
     private Boolean supplementAll;
 
+    private boolean preInBack;
+
 
 }

src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java

@@ -7,4 +7,5 @@ import lombok.Data;
 public class FilterInvPreinDetailRequest extends ListPageRequest {
 
     private String orderId;
+    private String code;
 }

src/main/java/com/glxp/api/res/inout/IoCodeResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.inout;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -80,12 +81,12 @@ public class IoCodeResponse {
     /**
      * 扫码数量
      */
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 部门编码外键

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

@@ -307,8 +307,8 @@ public class IoAddInoutService {
                 if (orderDetailCodeEntity.getBindRlFk().longValue() == udiRelevanceResponse.getId().longValue()
                         &&
                         StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo()))) {
-                    orderDetailCodeEntity.setCount(orderDetailCodeEntity.getCount() + codeTempEntity.getCount());
+                    orderDetailCodeEntity.setCount(orderDetailCodeEntity.getCount() + codeTempEntity.getMyCount());
-                    orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getReCount() + codeTempEntity.getReCount());
+                    orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getReCount() + codeTempEntity.getMyReCount());
                     orderDetailCodeService.update(orderDetailCodeEntity);
                     isUpdate = true;
                     break;
@@ -662,7 +662,7 @@ public class IoAddInoutService {
         ioOrderDetailCodeEntity.setSupId(codeTempEntity.getSupId());
         ioOrderDetailCodeEntity.setPrice(udiRelevanceResponse.getPrice());
         ioOrderDetailCodeEntity.setCount(codeTempEntity.getCount());
-        ioOrderDetailCodeEntity.setReCount(codeTempEntity.getReCount());
+        ioOrderDetailCodeEntity.setReCount(codeTempEntity.getMyReCount());
         return ioOrderDetailCodeEntity;
     }
 

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

@@ -171,7 +171,7 @@ public class IoCheckInoutService {
         IoOrderDetailCodeEntity orderDetailCodeEntity = orderDetailCodeService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo());
         int curCount = 0;
         if (orderDetailCodeEntity != null) {
-            curCount = orderDetailCodeEntity.getReCount() + codeEntity.getReCount();
+            curCount = orderDetailCodeEntity.getReCount() + codeEntity.getMyReCount();
         }
         if (curCount > bizEntity.getCount()) {
             return "当前产品数量超出！";
@@ -556,7 +556,7 @@ public class IoCheckInoutService {
                                     invPreinDetailEntity.setCount(count);
                                     invPreinDetailService.update(invPreinDetailEntity);
                                 }
-                                int reCount = invPreinDetailEntity.getReCount() - codeEntity.getReCount();
+                                int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount();
                                 if (reCount == 0) {
                                     invPreinDetailService.deleteByCode(key, codeEntity.getCode());
                                 } else {

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

@@ -161,7 +161,7 @@ public class IoGenInvService {
             List<IoCodeEntity> inList = new ArrayList<>();
             for (IoCodeEntity warehouseEntity : codeEnttities) {
                 Integer invCount = getInvCount(warehouseEntity);
-                Integer count = warehouseEntity.getReCount();
+                Integer count = warehouseEntity.getMyReCount();
                 if (invCount > 0) {//仓库已存在该产品
                     if (count > invCount) { //当前数量>结余数量，说明该产品是无序列号或者是多级包装
                         if (count > invCount) {      //该产品实际数量大于结余数量，说明是多级包装，直接补

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -220,11 +220,11 @@ public class IoOrderServiceImpl implements IoOrderService {
                 || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
             //更新正式表
             IoCodeEntity ioCodeEntity = codeService.findByUnique(billNo, code);
-            if (ioCodeEntity.getCount() > 1) {
+            if (ioCodeEntity.getMyCount() > 1) {
                 //更新码表
-                ioCodeEntity.setCount(ioCodeEntity.getCount() - 1);
+                ioCodeEntity.setCount(ioCodeEntity.getMyCount() - 1);
                 int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getRelId());
-                ioCodeEntity.setReCount(ioCodeEntity.getReCount() - reCount);
+                ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount);
                 codeService.updateById(ioCodeEntity); //更新码详情
 
                 //更新扫码单据详情
@@ -321,7 +321,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 //删除一个条码
                 ioCodeEntity.setCount(ioCodeEntity.getCount() - 1);
                 int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getRelId());
-                ioCodeEntity.setReCount(ioCodeEntity.getReCount() - reCount);
+                ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount);
                 codeTempService.updateById(ioCodeEntity); //更新码详情
             } else {
                 //如果数量扣减之后为0，直接删除此条码

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: true
 

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

@@ -12,6 +12,9 @@
             <if test="orderId != null and orderId != ''">
                 AND ic.orderId = #{orderId}
             </if>
+            <if test="code != null and code != ''">
+                and ic.code like concat('%',#{code},'%')
+            </if>
         </where>
         group by ic.id
     </select>