fix:产线叫料限制同一工单下的组盘物料

fix:mysql8的分组查询

nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java

@@ -74,7 +74,8 @@ public class MesToWmsServiceImpl implements MesToWmsService {
                 taskFormReturn.put("create_name", "MES");
                 LineReturnEmptyTask lineReturnEmptyTask = SpringContextHolder.getBean("LineReturnEmptyTask");
                 lineReturnEmptyTask.create(taskFormReturn);
-                if(Objects.equals(mesTaskParams.getRequestedCode(), "3") || Objects.equals(mesTaskParams.getRequestedCode(), "4")) break;
+                if (Objects.equals(mesTaskParams.getRequestedCode(), "3") || Objects.equals(mesTaskParams.getRequestedCode(), "4"))
+                    break;
             case "2"://叫满
                 if (!StrUtil.isEmptyIfStr(vehicleCode) && Objects.equals(mesTaskParams.getRequestedCode(), "2")) {
                     throw new BadRequestException("请求失败，上料口存在托盘占用");
@@ -82,6 +83,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
                 //获取组盘信息
                 List<GroupPlate> groupList = iMdPbGroupplateService.list(new LambdaQueryWrapper<GroupPlate>()
                         .eq(GroupPlate::getLoad_port, portPoint.getPoint_code())
+                        .eq(GroupPlate::getExt_code, mesTaskParams.getOrderCode())
                         .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")));
                 if (groupList.isEmpty()) {
                     throw new BadRequestException("叫满任务失败，库存没有当前下料口的组盘物料");

nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/service/dao/mapper/xml/PurchasemstMapper.xml

@@ -56,7 +56,21 @@
                 AND m.create_time <= #{params.createTime[1]}
             </if>
         </where>
-        GROUP BY m.bill_id
+        GROUP BY
+        m.id,
+        m.bill_id,
+        m.order_no,
+        m.order_type,
+        m.forwardZD,
+        m.supplier_code,
+        m.supplier_name,
+        m.creator,
+        m.create_time,
+        m.modify_date,
+        m.status,
+        m.red,
+        m.bill_status,
+        m.audit_msg
         ORDER BY m.create_time DESC
     </select>