bug修改

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

@@ -1219,10 +1219,25 @@ public class IoCodeTempController extends BaseController {
             }
         }
         if (codeTempEntity.getMyCount() <= 0) {
-            return ResultVOUtils.error(500, "数量不能小于0");
+            return ResultVOUtils.error(500, "数量需要大于0");
         }
+
+        IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId());
         codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+        int count = tempEntity.getCount() - codeTempEntity.getCount();
+
+        //更新扫码详情
+        IoOrderDetailCodeEntity orderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(codeTempEntity.getOrderId(), codeTempEntity.getRelId(), codeTempEntity.getBatchNo());
+        if (orderDetailCodeEntity != null) {
+            //扫码数量-1
+            int orderCount = orderDetailCodeEntity.getCount();
+            orderDetailCodeEntity.setCount(orderCount - count);
+            orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+            ioOrderDetailCodeService.update(orderDetailCodeEntity);
+        }
         int b = codeTempService.updateById(codeTempEntity);
+
+
         if (b > 0)
             return ResultVOUtils.success("修改成功");
         else return ResultVOUtils.error(500, "修改失败!");

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

@@ -427,6 +427,9 @@ public class IoOrderDetailBizController extends BaseController {
         purOrderEntity = purOrderService.selectById(purOrderEntity.getId());
         List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
         BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(purOrderEntity.getBillType());
+        if (basicBusTypeChangeEntity == null) {
+            return ResultVOUtils.error(500, "采购订单未配置转换单据类型！");
+        }
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction());
 
         AuthAdmin authAdmin = getUser();

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

@@ -36,10 +36,7 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.sync.HeartService;
 import com.glxp.api.service.system.SystemParamConfigService;
-import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.*;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.OrderNoTypeBean;
-import com.glxp.api.util.RedisUtil;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
@@ -354,11 +351,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.getMyCount() == checkOrderCodesBean.getScanCount()) {
+                        && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
                     return Constant.CHECK_REPEAT;
                 }
                 int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode());
-                if (curCount == checkOrderCodesBean.getMyCount()) {
+                if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) {
                     checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
                 }
                 checkOrderCodesBean.setScanCount(curCount);

src/main/java/com/glxp/api/controller/system/SysParamConfigController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -186,6 +187,8 @@ public class SysParamConfigController {
         filterParamConfigRequest.setParamType(2);
         filterParamConfigRequest.setParamStatus(1);
         List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.queryPage(filterParamConfigRequest);
+        systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getParamKey))
+                .collect(Collectors.toList());
         ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity();
 
         if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) {

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

@@ -313,7 +313,6 @@ public class IoAddInoutService {
 
         List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo").eq("orderIdFk", orderEntity.getBillNo()));
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId(), codeTempEntity.getSupId());
-//        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(codeTempEntity.getRelId());
         if (CollUtil.isEmpty(ioOrderDetailCodeEntities)) {
             orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));
         } else {

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

@@ -257,6 +257,11 @@ public class IoChangeInoutService {
                 codeTempEntities.add(codeTempEntity);
             }
             codeTempService.insertBatch(codeTempEntities);
+
+//            生成业务单
+
+
+
             if (isGenInovice) {
                 //生成发票信息
                 List<IoOrderInvoiceEntity> invoiceEntities = ioOrderInvoiceService.findByBillNo(orderEntity.getBillNo());

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

@@ -285,16 +285,20 @@ public class IoCheckInoutService {
         if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP) {
             orderDetailBizService.deleteByOrderId(orderEntity.getBillNo());
             orderDetailResultService.deleteByOrderId(orderEntity.getBillNo());
+            if (!orderDetailBizService.isExit(orderEntity.getBillNo())) {
+                orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
+                {
+                    //生成业务单据
+                    IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();
+                    BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity);
+                    orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount());
+                    orderDetailBizEntity.setId(null);
+                    orderDetailBizService.insert(orderDetailBizEntity);
+                });
+
+            }
             orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
             {
-                //生成业务单据
-                IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();
-                BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity);
-                orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount());
-                orderDetailBizEntity.setId(null);
-                orderDetailBizService.insert(orderDetailBizEntity);
-
-
                 //生成单据结果
                 IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity();
                 BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity);

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

@@ -185,6 +185,7 @@ public class IoGenInvService {
     }
 
 
+
     @Resource
     InvPreProductService invPreProductService;
     @Resource

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

@@ -299,7 +299,7 @@ public class IoOrderServiceImpl implements IoOrderService {
         //查询条码
         IoOrderEntity orderEntity = findByBillNo(billNo);
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED
-                || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
+                || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
             //更新正式表
             IoCodeEntity ioCodeEntity = codeService.findByUnique(billNo, code);
             if (ioCodeEntity.getMyCount() > 1) {
@@ -331,12 +331,12 @@ public class IoOrderServiceImpl implements IoOrderService {
 
                     InvPreInProductDetailEntity invProductDetailEntity = invPreinProductDetailService.selectByCode(billNo, code);
                     int count = invProductDetailEntity.getCount() - 1;
+                    int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                     if (count == 0) {
                         invPreinProductDetailService.deleteById(invProductDetailEntity.getId() + "");
                     } else {
                         //更新详情表
                         invProductDetailEntity.setCount(count);
-                        int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
                         invPreinProductDetailService.update(invProductDetailEntity);
                     }
@@ -344,10 +344,10 @@ public class IoOrderServiceImpl implements IoOrderService {
                     InvPreinProductEntity invProductEntity = invPreinProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
                     if (invProductEntity != null) {
                         if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) {
-                            int inCount = invProductEntity.getInCount() - invProductDetailEntity.getReCount();
+                            int inCount = invProductEntity.getInCount() - reCount;
                             invProductEntity.setInCount(inCount);
                         } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) {
-                            int outCount = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
+                            int outCount = invProductEntity.getOutCount() - reCount;
                             invProductEntity.setOutCount(outCount);
                         }
                         invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
@@ -357,12 +357,12 @@ public class IoOrderServiceImpl implements IoOrderService {
                 } else if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) {  //寄售库存
                     InvPreProductDetailEntity invProductDetailEntity = invPreProductDetailService.selectByCode(billNo, code);
                     int count = invProductDetailEntity.getCount() - 1;
+                    int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                     if (count == 0) {
                         invPreProductService.deleteById(invProductDetailEntity.getId());
                     } else {
                         //更新详情表
                         invProductDetailEntity.setCount(count);
-                        int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
                         invPreProductDetailService.update(invProductDetailEntity);
                     }
@@ -370,10 +370,10 @@ public class IoOrderServiceImpl implements IoOrderService {
                     InvPreProductEntity invProductEntity = invPreProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
                     if (invProductEntity != null) {
                         if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) {
-                            int inCount = invProductEntity.getInCount() - invProductDetailEntity.getReCount();
+                            int inCount = invProductEntity.getInCount() - reCount;
                             invProductEntity.setInCount(inCount);
                         } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) {
-                            int outCount = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
+                            int outCount = invProductEntity.getOutCount() - reCount;
                             invProductEntity.setOutCount(outCount);
                         }
                         invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
@@ -382,12 +382,12 @@ public class IoOrderServiceImpl implements IoOrderService {
                 } else {   //普通库存
                     InvProductDetailEntity invProductDetailEntity = invProductDetailService.selectByCode(billNo, code);
                     int count = invProductDetailEntity.getCount() - 1;
+                    int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                     if (count == 0) {
                         invProductDetailService.deleteById(invProductDetailEntity.getId());
                     } else {
                         //更新详情表
                         invProductDetailEntity.setCount(count);
-                        int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
                         invProductDetailService.update(invProductDetailEntity);
                     }
@@ -395,10 +395,10 @@ public class IoOrderServiceImpl implements IoOrderService {
                     InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
                     if (invProductEntity != null) {
                         if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) {
-                            int inCount = invProductEntity.getInCount() - invProductDetailEntity.getReCount();
+                            int inCount = invProductEntity.getInCount() - reCount;
                             invProductEntity.setInCount(inCount);
                         } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) {
-                            int outCount = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
+                            int outCount = invProductEntity.getOutCount() - reCount;
                             invProductEntity.setOutCount(outCount);
                         }
                         invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());

src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.purchase.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
@@ -64,6 +65,8 @@ public class PurOrderServiceImpl implements PurOrderService {
 
     @Override
     public Boolean insert(PurOrderEntity purOrderEntity) {
+        if (purOrderEntity.getId() == null)
+            purOrderEntity.setId(IdUtil.getSnowflakeNextId());
         return purOrderDao.insert(purOrderEntity) > 0 ? true : false;
     }
 

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -48,9 +48,9 @@
     basic_corp.`name` supName
     FROM
     pur_order_detail
-    INNER JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id
+    left JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id
-    INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+    left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
-    INNER JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId
+    left JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId
     <where>
       <if test="orderIdFk != '' and orderIdFk != null">
         AND orderIdFk = #{orderIdFk}
@@ -174,4 +174,4 @@
       and pur_order.status=3
     </where>
     </select>
-</mapper>
+</mapper>