出库单

sd-business/src/main/java/com/sd/business/service/work/impl/WorkOrderServiceImpl.java

@@ -234,7 +234,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             Set<Long> orderSkuIdSet = Stream.concat(addOrderSkuIdList.stream(), deleteOrderSkuIdList.stream())
                     .collect(Collectors.toSet());
 
-            Map<Long, OrderSku> map = orderSkuService.mapKEntity(BaseIdPo::getId, q -> q.in(BaseIdPo::getId, orderSkuIdSet));
+            Map<Long, OrderSku> map = Collections.emptyMap();
+            if (!orderSkuIdSet.isEmpty()) {
+                map = orderSkuService.mapKEntity(BaseIdPo::getId, q -> q.in(BaseIdPo::getId, orderSkuIdSet));
+            }
+
             for (Long item : deleteOrderSkuIdList) {
                 OrderSku orderSku = map.get(item);
                 Assert.notNull(orderSku, "未知订单skuId：" + item);
@@ -251,7 +255,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
             updateById(dto);
             workOrderDetailService.editLinked(newList, WorkOrderDetail::getWorkOrderId, id);
-            orderSkuService.updateBatchById(map.values());
+            if (!map.values().isEmpty()) {
+                orderSkuService.updateBatchById(map.values());
+            }
+
         } finally {
             schedulingLock.unlock();
         }

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

@@ -55,7 +55,7 @@ public class WlnOutboundOrderServiceImpl implements WlnOutboundOrderService {
     }
 
     /**
-     * 查询近万里牛出库单
+     * 查询万里牛出库单
      */
     private List<JSONObject> getWlnOutboundOrder() {
         OutboundOrder outboundOrder = outboundOrderService.getOne(q -> q.orderByDesc(OutboundOrder::getOutboundTimestamp));

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

@@ -146,10 +146,12 @@ public class WlnSkuServiceImpl implements WlnSkuService {
             if (tempSku == null) {
                 continue;
             }
+
             Sku oldSku = skuMap.get(tempSku.getWlnSkuId());
             if (oldSku != null) {
                 tempSku.setId(oldSku.getId());
             }
+
             newSkuList.add(tempSku);
 
             List<JSONObject> specList = wlnSku.getJSONArray("specs").toJavaList(JSONObject.class);
@@ -209,7 +211,6 @@ public class WlnSkuServiceImpl implements WlnSkuService {
      * 创建sku
      */
     private Sku createSku(JSONObject wlnSku, Map<String, Long> skuClassifyMap) {
-
         String catagoryId = wlnSku.getString("catagory_id");
         if (StrUtil.isBlank(catagoryId)) {
             return null;