订单优化

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderSkuBomVo.java

@@ -15,6 +15,11 @@ import lombok.Setter;
 public class OrderSkuBomVo extends OrderSkuBom {
 
     /**
+     * bom规格编码
+     */
+    private String bomSpecCode;
+
+    /**
      * bom规格名称
      */
     private String bomSpecName;

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

@@ -182,6 +182,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         List<OrderSkuBom> tempOrderSkuBomList = orderSkuBomService.list(q -> q.eq(OrderSkuBom::getOrderId, id));
         List<OrderSkuBomVo> orderSkuBomList = BeanUtil.copyToList(tempOrderSkuBomList, OrderSkuBomVo.class);
         bomSpecService.attributeAssign(orderSkuBomList, OrderSkuBom::getBomSpecId, (item, bomSpec) -> {
+            item.setBomSpecCode(bomSpec.getCode());
             item.setBomSpecName(bomSpec.getName());
         });
         Map<Long, List<OrderSkuBomVo>> orderSkuBomMap = orderSkuBomList.stream().collect(Collectors.groupingBy(OrderSkuBom::getOrderSkuId));

sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -258,6 +258,10 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         IWrapper<StockPreparationVo> wrapper = getWrapper(dto);
         List<StockPreparationVo> stockPreparationVoList = stockPreparationMapper.uncompletedList(wrapper);
 
+        if (stockPreparationVoList.size() == 0) {
+            return Collections.emptyList();
+        }
+
         // 订单sku包材列表
         List<Long> orderSkuIdList = stockPreparationVoList.stream().map(StockPreparationVo::getOrderSkuId).collect(Collectors.toList());
         List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderSkuId, orderSkuIdList));
@@ -296,7 +300,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
             BomSpecBo bomSpecBo = bomSpecBoMap.get(bomSpecId);
             outBomVo.setBomSpecCode(bomSpecBo.getBomSpecCode());
             outBomVo.setBomSpecName(bomSpecBo.getBomSpecName());
-            // 主材
+            // 主材9
             if (Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {
                 outBomVo.setWarehouseId(WarehouseConstant.SEMI_FINISHED_PRODUCT);
                 outBomVo.setWarehouseName("半成品仓");

sd-starter/src/test/java/C1_SyncInventoryTest.java

@@ -47,7 +47,7 @@ public class C1_SyncInventoryTest {
 
 
     /**
-     * excel修改库存
+     * excel新增库存
      */
     @SneakyThrows
     @DSTransactional
@@ -56,7 +56,7 @@ public class C1_SyncInventoryTest {
 
         DataListener<ExcelData> listener = new DataListener<>();
 
-        FileInputStream fileInputStream = new FileInputStream("E:\\库存表 (5).xlsx");
+        FileInputStream fileInputStream = new FileInputStream("E:\\9.1库存.xlsx");
 
         ExcelReaderBuilder read = EasyExcel.read(fileInputStream, ExcelData.class, listener);
         read.sheet(0).doRead();

sd-starter/src/test/java/C2_SyncInventoryTest.java

@@ -8,7 +8,6 @@ import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.in.InOutStorageDetailsService;
 import com.sd.business.service.inventory.InventoryService;
-import com.sd.business.service.warehouse.WarehouseService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +26,6 @@ public class C2_SyncInventoryTest {
 
 
     @Autowired
-    private WarehouseService warehouseService;
-
-    @Autowired
     private BomSpecService bomSpecService;
 
     @Autowired

sd-starter/src/test/java/D1_OrderCompare.java

@@ -25,7 +25,7 @@ public class D1_OrderCompare {
 
 
     /**
-     * string修改库存
+     * 订单对比
      */
     @DSTransactional
     @Test

sd-starter/src/test/java/TestList.java

@@ -23,6 +23,10 @@ public class TestList {
         stockPreparationDto.setDepartmentId(1689164627162529793L);
         List<UncompletedVo> uncompletedVos = stockPreparationService.uncompletedList(stockPreparationDto);
         System.out.println();
+
+
+        String sql = "update in_out_storage_details i INNER JOIN in_out_storage_bom iosb on i.bom_spec_id = iosb.bom_spec_id\n" +
+                "set i.quantity = i.quantity + iosb.quantity";
     }
 
 

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -553,24 +553,36 @@ public class WlnOrderServiceImpl implements WlnOrderService {
      * 查询万里牛订单列表
      */
     private List<JSONObject> getWlnOrderList(String warehouseCode) {
-        Long endTime = new Date().getTime();
+        long endTime = new Date().getTime();
         long startTime;
 
         OrderInfo orderInfo = orderService.getOne(q -> q
                 .eq(OrderInfo::getWlnStorageCode, warehouseCode)
                 .orderByDesc(OrderInfo::getWlnModifyTimestamp));
 
+        List<JSONObject> list = new ArrayList<>();
+
         if (orderInfo == null) {
-            startTime = endTime - 1000 * 60 * 60 * 24 * 5;
+            int day = 7;
+            startTime = endTime - 1000 * 60 * 60 * 24 * day;
+
+            for (int i = 0; i < day - 1; i++) {
+                getOrderList(startTime, startTime + 1000 * 60 * 60 * 24, warehouseCode, list);
+                startTime += 1000 * 60 * 60 * 24;
+            }
+
         } else {
             startTime = orderInfo.getWlnModifyTimestamp();
             if (endTime - startTime > 1000 * 60 * 60 * 24 * 7) {
                 startTime = endTime - 1000 * 60 * 60 * 24 * 7;
             }
+            getOrderList(startTime, endTime, warehouseCode, list);
         }
 
-        List<JSONObject> list = new ArrayList<>();
+        return list;
+    }
 
+    private void getOrderList(Long startTime, Long endTime, String warehouseCode, List<JSONObject> list) {
         int page = 1;
         int size;
         do {
@@ -584,8 +596,6 @@ public class WlnOrderServiceImpl implements WlnOrderService {
                 throw new ServiceException("订单同步失败");
             }
         } while (size >= 200);
-
-        return list;
     }
 
 }

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOutboundOrderServiceImpl.java

@@ -92,7 +92,7 @@ public class WlnOutboundOrderServiceImpl implements WlnOutboundOrderService {
         if (outboundOrder != null) {
             startTime = outboundOrder.getOutboundTimestamp();
         } else {
-            startTime = endTime - 1000 * 60 * 60 * 24 * 3;
+            startTime = endTime - 1000 * 60 * 60 * 24 * 7;
         }
 
         List<JSONObject> list = new ArrayList<>();