扫码异常单据撤回至草稿

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java

@@ -163,7 +163,6 @@ public class OrderController {
         if (StrUtil.isBlank(deleteRequest.getId()) && CollUtil.isEmpty(deleteRequest.getIds())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-
         if (deleteRequest.getStatus() != null) {
             OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
             orderFilterRequest.setStatus(deleteRequest.getStatus());
@@ -173,8 +172,6 @@ public class OrderController {
                 return ResultVOUtils.error(520, "单据不存在!");
             }
         }
-
-
         if (CollUtil.isNotEmpty(deleteRequest.getIds())) {
             orderService.deleteOrders(deleteRequest.getIds());
         } else {
@@ -709,7 +706,7 @@ public class OrderController {
         }
 
         OrderEntity orderEntity = orderService.findById(orderFilterRequest.getId());
-        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
         orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
         orderEntity.setErpFk(""); //将业务单据号置空
         List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId());
@@ -717,7 +714,6 @@ public class OrderController {
         codesService.deleteByOrderId(orderEntity.getId());
         orderEntity.setUpdateTime(new Date());
         orderService.updateOrder(orderEntity);
-
         return ResultVOUtils.success("单据撤回成功！");
     }
 

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -356,13 +356,15 @@ public class WareHouseController {
     public BaseResponse deleteCodesTempById(@RequestParam("id") Long id) {
 
         WarehouseEntity warehouseEntity = codesTempService.selectById(id);
+        if (warehouseEntity == null) {
+            return ResultVOUtils.error(500, "删除失败，单据已处理！");
+        }
         if (warehouseEntity.getCount() != null && warehouseEntity.getCount() > 1) {
             warehouseEntity.setCount(warehouseEntity.getCount() - 1);
             codesTempService.updateById(warehouseEntity);
         } else {
             codesTempService.deleteCodesTempById(warehouseEntity);
         }
-
         List<WarehouseEntity> temps = codesTempService.findByOrderId(warehouseEntity.getOrderId());
         if (temps.size() <= 0) {
             orderService.deleteById(warehouseEntity.getOrderId());
@@ -1378,12 +1380,12 @@ public class WareHouseController {
         if (null == id)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id);
-        FilterInvBusUserRequest filterInvBusUserRequest=new FilterInvBusUserRequest();
+        FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
         filterInvBusUserRequest.setScAction(warehouseBussinessTypeEntity.getAction());
         filterInvBusUserRequest.setSubInvCode(warehouseBussinessTypeEntity.getCode());
-        List<InvBusUserEntity> invBusUserEntityList=invBusUserService.filterInvBusUser(filterInvBusUserRequest);
-        if(invBusUserEntityList.size()>0){
-            return  ResultVOUtils.error(999,"有用户关联该单据请先移除再进行删除！");
+        List<InvBusUserEntity> invBusUserEntityList = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        if (invBusUserEntityList.size() > 0) {
+            return ResultVOUtils.error(999, "有用户关联该单据请先移除再进行删除！");
         }
 
         InvSubWarehouseEntity invSubWarehouseEntity =

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java

@@ -222,53 +222,8 @@ public class StockOrderServiceImpl implements StockOrderService {
                     不是预验收单据，则正常扣减库存，回滚业务单据状态
             */
             if (isPreInOrder(orderEntity)) {
-
                 invPreInProductDetailDao.deleteByOrderId(orderEntity.getId());
                 invPreInProductDao.deleteByOrderIdFk(orderEntity.getId());
-
-
-                //查询预验收库库存详情
-//                FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-//                filterInvProductDetailRequest.setOrderIdFk(orderEntity.getId());
-//                List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
-//                List<InvProductEntity> invPreInProductList = new ArrayList<>();
-//                for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
-//                    FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
-//                    filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
-//                    filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
-//                    filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode());
-//                    filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
-//                    if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
-//                        filterInvProductRequest.setBatchNo("empty");
-//                    } else {
-//                        filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
-//                    }
-//                    List<InvProductEntity> invProductEntities = invPreInProductDao.filterInvProduct(filterInvProductRequest);
-//                    if (CollUtil.isNotEmpty(invProductEntities) && invProductEntities.size() > 0) {
-//                        InvProductEntity invProductEntity = invProductEntities.get(0);
-//                        calculateInvCount(invProductEntity, invProductDetailEntity);
-//                        invPreInProductList.add(invProductEntity);
-//                    } else {
-//                        return false;
-//                    }
-//                }
-//                //删除库存详情
-//                invPreInProductDetailDao.deleteByOrderId(orderEntity.getId());
-//                //更新库存
-//                for (InvProductEntity invProductEntity : invPreInProductList) {
-//                    //查询库存码详情，如果库存码详情为空，则删除此库存
-//                    FilterInvProductDetailRequest detailParams = new FilterInvProductDetailRequest();
-//                    detailParams.setBatchNo(invProductEntity.getBatchNo());
-//                    detailParams.setInvCodes(Collections.singletonList(invProductEntity.getInvStorageCode()));
-//                    detailParams.setProductIdFk(invProductEntity.getRelIdFk());
-//                    int count = invPreInProductDetailDao.statCount(detailParams);
-//                    if (count == 0) {
-//                        //如果库存码详情为空，则删除此库存
-//                        invPreInProductDao.deleteById(String.valueOf(invProductEntity.getId()));
-//                    } else {
-//                        invPreInProductDao.updateInvProduct(invProductEntity);
-//                    }
-//                }
             } else {
                 //非预验收单据库存，正常扣减库存
                 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();

api-admin/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9996
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms_za?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000