2/24 灯组信息 槽位信息1.0

src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java

@@ -183,6 +183,9 @@ public class IoCollectOrderResponse {
      */
     private Integer checkCodeStatus;
 
+    private Integer ledNum;
+
+
 
     public String getFromName() {
 

src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java

@@ -167,7 +167,7 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
                 .orderByAsc(SysOrderLed::getLedNum));
         //如果为null 当前灯组已满
         if (orderLeds.isEmpty()) {
-            // 如果没有可用灯组，抛出异常或返回 null
+            // 如果没有可用灯组，抛出异常或返回 null  或者返回其他数字
             throw new JsonException("没有可用灯组!");
         }
         SysOrderLed orderLed = orderLeds.get(0);

src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java

@@ -37,6 +37,15 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
     }
 
     public String setProductName(CollectOrderBizResponse collectOrderBizResponse){
+        String[] parts = collectOrderBizResponse.getWorkplaceQueueCode().split("-");
+        String shelf = "";
+        String layer = "";
+        // 检查分割后的数组长度是否符合预期
+        if (parts.length == 3) {
+            // 分别赋值给对应的变量
+             shelf = parts[0];  // 货架
+             layer = parts[1];  // 层
+        }
         StringBuilder sb = new StringBuilder();
             if (collectOrderBizResponse.getRegionName() != null && !collectOrderBizResponse.getRegionName().isEmpty()) {
                 sb.append(collectOrderBizResponse.getRegionName());
@@ -47,18 +56,25 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
                 }
                 sb.append(collectOrderBizResponse.getFreightName());
             }
-            if (collectOrderBizResponse.getQueueName() != null && !collectOrderBizResponse.getQueueName().isEmpty()) {
+        if (layer != null && !layer.isEmpty()) {
             if (sb.length() > 0) {
                 sb.append("-");
             }
-                sb.append(collectOrderBizResponse.getQueueName());
+            sb.append(layer + "层");
         }
-            if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) {
+
+//            if (collectOrderBizResponse.getQueueName() != null && !collectOrderBizResponse.getQueueName().isEmpty()) {
 //                if (sb.length() > 0) {
 //                    sb.append("-");
 //                }
-                sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")");
+//                sb.append(collectOrderBizResponse.getQueueName());
-            }
+//            }
+//            if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) {
+//                if (sb.length() > 0) {
+//                    sb.append("-");
+//                }
+//                sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")");
+//            }
             return sb.toString();
     }
 

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -30,6 +30,7 @@
                ico.orderTime,
                ico.uploadStatus,
                ico.uploadError,
+               sol.ledNum,
                ico.errorMsg,
                row_number() over ( order by case
                                                 when ico.orderTime is null then ico.createTime
@@ -40,6 +41,7 @@
                  left join basic_bussiness_type on ico.busType = basic_bussiness_type.action
                  left join basic_corp bc on ico.fromCorp = bc.erpId
                  left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
+                 left join sys_order_led sol on sol.orderId = ico.billNo
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')