楚江erp: 发货单编号生成逻辑调整

@@ -824,15 +824,6 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             // 封装发货单数据
             ShipmentsOrderInfo shipmentsOrderInfo = new ShipmentsOrderInfo();
             shipmentsOrderInfo.setId(id);
-            // 发货单编号处理
-            // 获取当月最后一天的23:59:59
-            LocalDateTime monthEnd = LocalDateTime.now()
-                    .with(TemporalAdjusters.lastDayOfMonth())
-                    .withHour(23)
-                    .withMinute(59)
-                    .withSecond(59);
-            String serialNumber = generateSerialNumber(null, "", "yyMM", LocalDateTime.now(), monthEnd);
-            shipmentsOrderInfo.setCode(serialNumber);
             shipmentsOrderInfo.setPlanId(planId);
             shipmentsOrderInfo.setCustomerId(customerId);
             shipmentsOrderInfo.setWorkshopId(plan.getWorkshopId());
@@ -867,6 +858,19 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         // todo 后续如果数据量过大，则此处需要优化
         // 生成要车相关数据
         generateRequestCarData(orderInfoList, orderIds, plan, quantityMap, shipmentsOrderIdMap);
+        // 生成发货单编号
+        // 获取当月最后一天的23:59:59
+        LocalDateTime monthEnd = LocalDateTime.now()
+                .with(TemporalAdjusters.lastDayOfMonth())
+                .withHour(23)
+                .withMinute(59)
+                .withSecond(59);
+        LocalDateTime now = LocalDateTime.now();
+        for (ShipmentsOrderInfo shipmentsOrderInfo : shipmentsOrderInfoList) {
+            String serialNumber = generateSerialNumber(null, "SHIPMENT_ORDER_SERIAL_NUMBER", "yyMM", now, monthEnd);
+            shipmentsOrderInfo.setCode(serialNumber);
+        }
+        getBaseMapper().setShipmentOrderCode(shipmentsOrderInfoList);
     }
 
 
@@ -972,4 +976,15 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             }
         }
     }
+
+
+    /**
+     *
+     */
+    private void rollbackRedisIncrement(String key) {
+        Long current = (Long) redisTemplate.opsForValue().get(key);
+        if (current != null && current > 0) {
+            redisTemplate.opsForValue().decrement(key, 1);
+        }
+    }
 }

@@ -55,4 +55,11 @@ public interface ShipmentsOrderInfoMapper extends BaseMapper<ShipmentsOrderInfo>
      * @return              Map<Integer, Integer>
      */
     List<Map<String, Object>> countWaitDeliveredOrder(@Param("customerNames") List<String> customerNames);
+
+    /**
+     * 设置发货单编号
+     *
+     * @param shipmentsOrderInfos    发货单数据
+     */
+    void setShipmentOrderCode(@Param("shipmentsOrderInfos") List<ShipmentsOrderInfo> shipmentsOrderInfos);
 }

@@ -158,4 +158,18 @@
         </if>
         group by c.name
     </select>
+
+    <update id="setShipmentOrderCode">
+        UPDATE shipments_order_info
+        SET code = CASE id
+        <foreach collection="shipmentsOrderInfos" item="item">
+            WHEN #{item.id} THEN #{item.code}
+        </foreach>
+        ELSE code
+        END
+        WHERE id IN
+        <foreach collection="shipmentsOrderInfos" item="item" open="(" close=")" separator=",">
+            #{item.id}
+        </foreach>
+    </update>
 </mapper>