diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 3d21a6ee2..26b5d205b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -52,11 +52,16 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .route_plan_code(getRoutePlanCode(json.getString("point_code2"))) .vehicle_code(json.getString("vehicle_code")) .priority(json.getString("priority")) - .class_type(json.getString("task_type")) + .class_type(IOSEnum.ACS_TYPE.code("木箱入库行架任务")) .dtl_type(String.valueOf(dtl_type)) .interaction_json(json.getJSONObject("request_param")) .remark(json.getString("remark")) .build(); + + dto.setClass_type(json.getString("point_code1").equals(IOSEnum.POINT_CODE.code("退货入库位")) + ? IOSEnum.ACS_TYPE.code("退货入库行架任务") : IOSEnum.ACS_TYPE.code("木箱入库行架任务") + ); + resultList.add(dto); } return resultList; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java index 860f9a7ea..23959c10e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java @@ -57,7 +57,7 @@ public class TwoOutHeapTask extends AbstractAcsTask { .vehicle_code(json.getString("vehicle_code2")) .interaction_json(json.getJSONObject("request_param")) .priority(json.getString("priority")) - .class_type(json.getString("task_type")) + .class_type(IOSEnum.ACS_TYPE.code("RGV输送任务")) .dtl_type(String.valueOf(dtl_type)) .remark(json.getString("remark")) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java index b50ee1354..94a58cbf1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java @@ -96,6 +96,7 @@ public class MzhcwTask extends AbstractAcsTask { .vehicle_code(r.getVehicle_code()) .priority(r.getPriority()) .remark(r.getRemark()) + .class_type(IOSEnum.ACS_TYPE.code("子卷下线行架任务")) .product_area(r.getProduct_area()) .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")) .interaction_json(JSON.parseObject(r.getRequest_param())) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java index 5fc278697..54905a693 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java @@ -98,6 +98,7 @@ public class ZxDjwTask extends AbstractAcsTask { .priority(r.getPriority()) .remark(r.getRemark()) .product_area(r.getProduct_area()) + .class_type(IOSEnum.ACS_TYPE.code("装箱入库行架任务")) //.agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务")) //.truss_type(PackageInfoIvtEnum.TRUSS_TYPE.code("点对点任务")) //.dtl_type(r.getDtl_type()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java index a9aa8eda9..44f224119 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java @@ -110,6 +110,9 @@ public enum IOSEnum { // 行架点位 OUT_HANGER(MapOf.of("行架位1", "CK2013","行架位2", "CK2017")), + // 点位 + POINT_CODE(MapOf.of("退货入库位", "THRKDJW1")), + //acs申请任务 ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")), @@ -118,6 +121,11 @@ public enum IOSEnum { // 异常出库口 EXCEP_OUT(MapOf.of("异常出库口", "CK2001")), + + // 下发acs任务类型（明细） + ACS_TYPE(MapOf.of("木箱入库行架任务", "12","装箱入库行架任务", "13", + "子卷下线行架任务", "9","退货入库行架任务", "14","RGV输送任务", "15" + )), ; private Map code; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java index 8bedc8387..c91bc4380 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java @@ -148,4 +148,19 @@ public class StIvtIostorinvdis implements Serializable { */ private String box_no; + /** + * 是否超期 + */ + private String is_overdue; + + /** + * 入库时间 + */ + private String instorage_time; + + /** + * 是否回传 + */ + private String is_upload; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java index 96fd32683..32ade0fd9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java @@ -301,6 +301,8 @@ public class OutBussManageServiceImpl implements OutBussManageService { .qty_unit_name(jsonUnit.getString("unit_name")) .plan_qty(jsonIvt.getBigDecimal("canuse_qty")) .real_qty(jsonIvt.getBigDecimal("canuse_qty")) + .instorage_time(jsonIvt.getString("instorage_time")) + .is_overdue(jsonIvt.getString("is_overdue")) .work_status(work_status) .box_no(jsonSub.getString("package_box_sn")) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql index b80f7c39e..d398c3c2f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTDIV.wql @@ -58,7 +58,14 @@ attr.sect_id, attr.sect_code, attr.sect_name, - sub.sale_order_name + sub.sale_order_name, + CASE + WHEN SUBSTRING(sub.container_name,1,1) = 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '180' + THEN '1' + WHEN SUBSTRING(sub.container_name,1,1) != 'B' AND DATEDIFF( NOW(), sub.date_of_production ) > '90' + THEN '1' + ELSE '0' + END AS is_overdue FROM ST_IVT_StructIvt ivt LEFT JOIN ST_IVT_StructAttr attr ON attr.struct_id = ivt.struct_id @@ -80,6 +87,9 @@ attr.storagevehicle_code in 输入.box_in ENDOPTION + order by ivt.instorage_time ASC + + ENDSELECT ENDQUERY ENDIF \ No newline at end of file