订单状态梳理

sd-business/src/main/java/com/sd/business/controller/inventory/InventoryBackupController.java

@@ -30,6 +30,14 @@ public class InventoryBackupController {
     private InventoryBackupService inventoryBackupService;
 
     /**
+     * 库存日期分组分页
+     */
+    @PostMapping("/groupPage")
+    public Page<InventoryBackupVo> groupPage(@RequestBody InventorySelectDto dto) {
+        return inventoryBackupService.groupPage(dto);
+    }
+
+    /**
      * 库存快照分页
      */
     @PostMapping("/page")
@@ -46,12 +54,4 @@ public class InventoryBackupController {
         inventoryBackupService.exportExcel(dto);
     }
 
-    /**
-     * 库存日期分组分页
-     */
-    @PostMapping("/groupPage")
-    public Page<InventoryBackupVo> groupPage(@RequestBody InventorySelectDto dto) {
-        return inventoryBackupService.groupPage(dto);
-    }
-
 }

sd-business/src/main/java/com/sd/business/service/inventory/InventoryBackupService.java

@@ -19,6 +19,11 @@ import com.sd.business.entity.inventory.vo.InventoryBackupVo;
 public interface InventoryBackupService extends BaseService<InventoryBackup> {
 
     /**
+     * 库存日期分组分页
+     */
+    Page<InventoryBackupVo> groupPage(InventorySelectDto dto);
+
+    /**
      * 库存快照分页
      */
     Page<InventoryBackupVo> getPage(InventoryBackupSelectDto dto);
@@ -28,9 +33,4 @@ public interface InventoryBackupService extends BaseService<InventoryBackup> {
      */
     void exportExcel(InventoryBackupSelectDto dto);
 
-    /**
-     * 库存日期分组分页
-     */
-    Page<InventoryBackupVo> groupPage(InventorySelectDto dto);
-
 }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryBackupServiceImpl.java

@@ -39,6 +39,31 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
     private HttpServletResponse response;
 
     @Override
+    public Page<InventoryBackupVo> groupPage(InventorySelectDto dto) {
+
+        Page<InventoryBackupVo> page = Sql.create(InventoryBackupVo.class)
+                .select(InventoryBackup::getBackupDate)
+                .from(InventoryBackup.class)
+                .ge(InventoryBackup::getBackupDate, dto.getBeginTime())
+                .le(InventoryBackup::getBackupDate, dto.getEndTime())
+                .orderByDesc(InventoryBackup::getId)
+                .groupBy(InventoryBackup::getBackupDate)
+                .page(dto);
+
+        List<InventoryBackupVo> records = page.getRecords();
+        if (records.isEmpty()) {
+            return page;
+        }
+
+        for (InventoryBackupVo record : records) {
+            record.setBackupDateStr(DateUtil.format(record.getBackupDate(), "yyyy-MM-dd"));
+            record.setBackupDate(DateUtil.offsetDay(record.getBackupDate(), 1));
+        }
+
+        return page;
+    }
+
+    @Override
     public Page<InventoryBackupVo> getPage(InventoryBackupSelectDto dto) {
 
         return Sql.create(InventoryBackupVo.class)
@@ -82,29 +107,4 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
         ExcelUtil.export(response, DateUtil.format(new Date(), "yyyy-MM-dd库存数据"), "库存数据", list, InventoryBackupVo.class);
     }
 
-    @Override
-    public Page<InventoryBackupVo> groupPage(InventorySelectDto dto) {
-
-        Page<InventoryBackupVo> page = Sql.create(InventoryBackupVo.class)
-                .select(InventoryBackup::getBackupDate)
-                .from(InventoryBackup.class)
-                .ge(InventoryBackup::getBackupDate, dto.getBeginTime())
-                .le(InventoryBackup::getBackupDate, dto.getEndTime())
-                .orderByDesc(InventoryBackup::getId)
-                .groupBy(InventoryBackup::getBackupDate)
-                .page(dto);
-
-        List<InventoryBackupVo> records = page.getRecords();
-        if (records.isEmpty()) {
-            return page;
-        }
-
-        for (InventoryBackupVo record : records) {
-            record.setBackupDateStr(DateUtil.format(record.getBackupDate(), "yyyy-MM-dd"));
-            record.setBackupDate(DateUtil.offsetDay(record.getBackupDate(), 1));
-        }
-
-        return page;
-    }
-
 }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedOrderServiceImpl.java

@@ -21,6 +21,7 @@ import com.sd.framework.util.Assert;
 import com.sd.framework.util.sql.Sql;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,7 +44,7 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
     @Override
     public Page<InventoryFinishedOrderVo> getPage(InventoryFinishedOrderSelectDto dto) {
 
-        Page<InventoryFinishedOrderVo> page = Sql.create(InventoryFinishedOrderVo.class)
+        return Sql.create(InventoryFinishedOrderVo.class)
                 .select(InventoryFinishedOrderDetail::getQuantity,
                         InventoryFinishedOrderDetail::getCreateTime,
                         InventoryFinishedOrderDetail::getOperationType,
@@ -69,8 +70,6 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
                 .like(OrderInfo::getWlnCode, dto.getOrderWlnCode())
                 .eq(Department::getId, dto.getDepartmentId())
                 .page(dto);
-
-        return page;
     }
 
     @Override
@@ -102,6 +101,7 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
         removeById(id);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void productionWarehousing(List<OrderSku> orderSkuList) {
         // 保存成品订单信息

sd-business/src/main/java/com/sd/business/service/order/impl/OrderInfoServiceImpl.java

@@ -293,21 +293,23 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         dto.setSource(1);
         dto.setCode("PI" + new Date().getTime());
         dto.setSettlementStatus(1);
-        dto.setTaxRate(new BigDecimal("10.00"));
+        dto.setTaxRate(BigDecimal.TEN);
         dto.setTag("0");
         dto.setExceptionType(OrderExceptionTypeEnum.NORMAL.getKey().toString());
-        if (Objects.equals(dto.getType(), 2)) {
-            dto.setClassify(OrderClassifyEnum.OUTSOURCE_ORDER.getKey());
-        } else if (Objects.equals(dto.getType(), 1)) {
-            // 拥有采购角色的账号创建的自主订单为采购订单
+
+        // 拥有采购角色的账号创建的自主订单为采购订单
+        if (Objects.equals(dto.getType(), 1)) {
             Long userId = SecurityUtils.getUserId();
             Set<String> roleKeys = roleService.selectRolePermissionByUserId(userId);
             if (!Collections.disjoint(roleKeys, Arrays.asList("sypurchasing", "purchasingOfficer", "bzpurchasing"))) {
                 dto.setClassify(OrderClassifyEnum.PURCHASE_ORDER.getKey());
             }
         }
-        // 委外订单修改金额
-        if (ObjectUtil.equals(dto.getType(), 2)) {
+        // 订单为委外订单时，订单分类为委外订单
+        else if (Objects.equals(dto.getType(), 2)) {
+            dto.setClassify(OrderClassifyEnum.OUTSOURCE_ORDER.getKey());
+
+            // 委外订单修改金额
             dto.setProductTotalAmount(BigDecimal.ZERO);
             dto.setDeliveryMaterialsFee(BigDecimal.ZERO);
             dto.setManagementFee(BigDecimal.ZERO);
@@ -320,6 +322,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .add(dto.getPackagingMaterialCost())
                     .add(dto.getManagementFee()));
         }
+
         save(dto);
 
         // 新增订单产品包材配件
@@ -367,13 +370,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             orderSkuProductionCost.setProductPackagingMaterialCost(productPackagingMaterialCost);
             // 物流包材成本
-            orderSkuProductionCost.setLogisticsPackagingMaterialCost(item.getDeliveryMaterialsFee()
-                    .multiply(item.getQuantity()));
-            orderSkuProductionCost.setTotalAmount(
-                    orderSkuProductionCost.getMaterialCost()
-                            .add(orderSkuProductionCost.getAuxiliaryMaterialCost())
-                            .add(orderSkuProductionCost.getProductPackagingMaterialCost())
-                            .add(orderSkuProductionCost.getLogisticsPackagingMaterialCost()));
+            orderSkuProductionCost.setLogisticsPackagingMaterialCost(item.getDeliveryMaterialsFee().multiply(item.getQuantity()));
+            orderSkuProductionCost.setTotalAmount(orderSkuProductionCost.getMaterialCost()
+                    .add(orderSkuProductionCost.getAuxiliaryMaterialCost())
+                    .add(orderSkuProductionCost.getProductPackagingMaterialCost())
+                    .add(orderSkuProductionCost.getLogisticsPackagingMaterialCost()));
             return orderSkuProductionCost;
         }).collect(Collectors.toList());
         orderSkuProductionCostService.saveBatch(orderSkuProductionCostList);
@@ -411,17 +412,18 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @DSTransactional
     @Override
     public void edit(OrderInfoDto dto) {
-        // 订单为委外订单时，订单分类为委外订单
-        if (Objects.equals(dto.getType(), 2)) {
-            dto.setClassify(OrderClassifyEnum.OUTSOURCE_ORDER.getKey());
-        } else if (Objects.equals(dto.getType(), 1)) {
-            // 拥有采购角色的账号创建的自主订单为采购订单
+        // 拥有采购角色的账号创建的自主订单为采购订单
+        if (Objects.equals(dto.getType(), 1)) {
             Long userId = dto.getCreateUser();
             Set<String> roleKeys = roleService.selectRolePermissionByUserId(userId);
             if (!Collections.disjoint(roleKeys, Arrays.asList("sypurchasing", "purchasingOfficer", "bzpurchasing"))) {
                 dto.setClassify(OrderClassifyEnum.PURCHASE_ORDER.getKey());
             }
         }
+        // 订单为委外订单时，订单分类为委外订单
+        else if (Objects.equals(dto.getType(), 2)) {
+            dto.setClassify(OrderClassifyEnum.OUTSOURCE_ORDER.getKey());
+        }
 
         // 更新订单
         updateById(dto);