rev:表处逻辑修改

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/ProcessTask.java

@@ -136,12 +136,13 @@ public class ProcessTask extends AbstractAcsTask {
                 HashMap map = new HashMap();
                 map.put("container_name", "");
                 map.put("full_vehicle_code", "");
+                map.put("full_point_status", "01");
                 ivtTab.update(map, "full_point_code = '" + point_code1 + "'");
                 //维护表处区点位
                 HashMap map2 = new HashMap();
                 map2.put("up_scroll", full_vehicle_code);
                 map2.put("up_pcsn", container_name);
-                stTab.update(map2, "point_code = '" + point_code2 + "'").uniqueResult(0);
+                stTab.update(map2, "up_point_code = '" + point_code2 + "'").uniqueResult(0);
             }
             if ("010703".equals(task_type)) {
                 //维护表处区点位

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -1501,9 +1501,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             if ("1".equals(Type)) {
                 String up_scroll = device_jo.getString("up_scroll");
                 String up_pcsn = device_jo.getString("up_pcsn");
-                if (StrUtil.isNotEmpty(up_pcsn)) {
+                /*if (StrUtil.isNotEmpty(up_pcsn)) {
                     throw new BadRequestException("LMS系统上【" + ResourceName + "】表处机上还存在母卷号，不能进行上料！");
-                }
+                }*/
                 //查询母卷所在点位
                 JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04'").uniqueResult(0);
                 JSONObject form = new JSONObject();

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql

@@ -51,7 +51,7 @@
             FROM
             	ST_IVT_CoolPointIvt ivt
             WHERE
-                ivt.empty_point_status = '02'
+                ivt.empty_point_status = '01'
             AND
                 ivt.full_point_status = '01'
             AND