代码更新

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * @author ludj
  * @date 2021-07-21
@@ -57,7 +55,7 @@ public class AcsToWmsController {
     @Log("二次申请任务")
     @ApiOperation("二次申请任务")
     @SaCheckPermission("menu:list")
-    public ResponseEntity<Object> towApply(@RequestBody String task_id) {
+    public ResponseEntity<Object> againApply(@RequestBody String task_id) {
         return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK);
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java

@@ -103,6 +103,11 @@ public class TaskServiceImpl implements TaskService {
                 JSONObject point2 = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
                 taskObj.put("point2_region_name", point2.getString("region_name"));
             }
+            String point_code3 = taskObj.getString("point_code3");
+            if (ObjectUtil.isNotEmpty(point_code3)) {
+                JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0);
+                taskObj.put("point3_region_name", point3.getString("region_name"));
+            }
             res.add(taskObj);
         }
         json.put("content", res);

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java

@@ -308,6 +308,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+//    虽然是养生A区，应该有二次申请，但是通过判断叠盘架是否有任务来判断做限制
     public String createTask(JSONObject form) {
         /*
          * 1.先生成确定终点的任务

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java

@@ -167,6 +167,9 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
         }
     }
 
+    /**
+     * 虽然是养生A区，应该有二次申请，但是通过判断叠盘架是否有任务来判断做限制
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void findStartPoint() {

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java

@@ -168,7 +168,6 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                 JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='1'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!");
                 taskObj.put("point_code2", firstRow.getString("point_code"));
-                taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
                 taskObj.put("update_time", DateUtil.now());
                 //需要设置等待点
                 if (row_num > 2) {
@@ -178,6 +177,10 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                     //二楼普通任务
                     taskObj.put("acs_task_type", "2");
                 }
+                //把物料信（SKU）息更新到点位上
+                JSONObject param = new JSONObject();
+                param.put("material_id", taskObj.getString("material_id"));
+                pointTab.update(param, "block_num = '" + block_num + "' and row_num = '" + (row_num-1) + "' and col_num = '" + col_num + "'");
 
                 taskTab.update(taskObj);
             } else {//找空位入
@@ -196,7 +199,6 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                     Integer col_num = json2.getInteger("col_num");
                     JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='1'").uniqueResult(0);
                     taskObj.put("point_code2", firstRow.getString("point_code"));
-                    taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
                     //二楼终点追加任务
                     taskObj.put("acs_task_type", "4");
                     taskObj.put("update_time", DateUtil.now());

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql

@@ -51,15 +51,15 @@
             	p.row_num,
             	p.col_num
             FROM
-            	ST_IVT_StructIvt ivt
+
-            	LEFT JOIN SCH_BASE_Point p on ivt.point_id = p.point_id
+              SCH_BASE_Point p
-            WHERE
+            	where p.is_used = '1'
-             	  p.is_used = '1'
             	AND is_delete = '0'
-            	and lock_type='1'
+            	AND lock_type = '1'
-            	and p.row_num>1
+            	AND p.row_num >1
+            	and p.point_status='1'
             	OPTION 输入.material_id <> ""
-                     ivt.material_id = 输入.material_id
+                     p.material_id = 输入.material_id
                 ENDOPTION
                 OPTION 输入.region_code <> ""
                      p.region_code = 输入.region_code

lms/nladmin-system/src/main/resources/config/application-dev.yml

@@ -6,8 +6,8 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:P@ssw0rd}
       #      password: ${DB_PWD:12356}

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -113,11 +113,11 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column v-if="false" prop="task_id" label="任务标识" />
+        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
         <el-table-column   prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="task_ame" label="任务描述" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
@@ -127,6 +127,8 @@
         <el-table-column prop="point1_region_name" label="区域1" width="100" />
         <el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
         <el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />
         <!--<el-table-column prop="point_code3" label="点位3" width="85" />
         <el-table-column prop="point_code4" label="点位4" width="85" />-->
         <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />