root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-01-09 09:58:14 +08:00
parent 0686beac3d 4f68ed9dfe
commit f4337c5b4e
38 changed files with 1974 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -67,6 +67,11 @@ public class OutTask extends AbstractAcsTask {
.remark(json.getString("remark"))
.build();
resultList.add(dto);
// 更新任务为下发
JSONObject paramMap = new JSONObject();
paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
wo_Task.update(paramMap,"task_id ='"+json.getString("task_id")+"'");
} else {
// 2.有任务组：按照执行顺序下发 大到小
JSONArray taskArr = wo_Task.query("task_group_id = '" + json.getString("task_group_id") + "' order by sort_seq DESC").getResultJSONArray(0);
@@ -89,12 +94,12 @@ public class OutTask extends AbstractAcsTask {
.build();
resultList.add(dto);
}
}
// 更新分配明细执行状态为：执行中
JSONObject paramMap = new JSONObject();
paramMap.put("work_status", "02");
dis_tab.update(paramMap,"task_id ='"+json.getString("task_id")+"'");
// 更新任务为下发
JSONObject paramMap = new JSONObject();
paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'");
}
}
return resultList;
}

10
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
View File

@@ -121,6 +121,16 @@ public interface CheckOutBillService {
* @param whereJson /
*/
void oneSetPoint(JSONObject whereJson);
/**
* 设置一个站点
* @param whereJson /
*/
void oneSetPoint2(JSONObject whereJson);
/**
* 设置全部站点
* @param whereJson /
*/
void allSetPoint(JSONObject whereJson);
/**
* 查询可分配库存
* @param whereJson /

3
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -25,6 +25,7 @@ import org.nl.wms.basedata.st.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.dto.StructattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.TaskService;
import org.nl.wms.sch.service.dto.PointDto;
@@ -1123,7 +1124,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
}*/
AbstractAcsTask task = new InTask();
task.updateTaskStatus(task_jo, "2");
task.updateTaskStatus(task_jo, TaskStatusEnum.FINISHED.getCode());
}
@Override

14
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
View File

@@ -138,6 +138,20 @@ public class CheckOutBillController {
checkOutBillService.oneSetPoint(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/oneSetPoint2")
@Log("设置一个站点")
@ApiOperation("设置检验站点")
public ResponseEntity<Object> oneSetPoint2(@RequestBody JSONObject whereJson) {
checkOutBillService.oneSetPoint2(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/allSetPoint")
@Log("设置全部站点")
@ApiOperation("设置全部站点")
public ResponseEntity<Object> allSetPoint(@RequestBody JSONObject whereJson) {
checkOutBillService.allSetPoint(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/getOutBillTask")
@Log("查询出库单分配任务")
@ApiOperation("查询出库单分配任务")

1066
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

3
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -365,7 +365,8 @@
attr.row_num,
attr.col_num,
attr.layer_num,
attr.block_num
attr.block_num,
attr.placement_type
FROM
ST_IVT_IOStorInvDis dis
LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id

273
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql Normal file
View File

@@ -0,0 +1,273 @@
[交易说明]
交易名： 一键生成任务逻辑
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.iostorinvdtl_id TYPEAS s_string
输入.block_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.out_order_seq TYPEAS s_string
输入.iostorinvdis_id TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
QUERY
SELECT
attr.block_num,
attr.row_num,
MAX(attr.placement_type) AS placement_type
FROM
ST_IVT_IOStorInvDis dis
LEFT JOIN st_ivt_structattr attr ON dis.struct_id = attr.struct_id
WHERE
dis.work_status = '00'
OPTION 输入.iostorinvdtl_id <> ""
dis.iostorinvdtl_id = 输入.iostorinvdtl_id
ENDOPTION
group by attr.block_num,attr.row_num
order by attr.row_num ASC
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "2"
QUERY
SELECT
max(dis.iostorinvdis_id) AS iostorinvdis_id,
max(dis.iostorinv_id) AS iostorinv_id,
max(dis.iostorinvdtl_id) AS iostorinvdtl_id,
max(dis.seq_no) AS seq_no,
max(dis.sect_id) AS sect_id,
max(dis.sect_code) AS sect_code,
max(dis.sect_name) AS sect_name,
max(dis.struct_id) AS struct_id,
max(dis.struct_code) AS struct_code,
max(dis.struct_name) AS struct_name,
max(dis.struct_name) AS struct_name,
max(dis.material_id) AS material_id,
max(dis.pcsn) AS pcsn,
max(dis.box_no) AS box_no,
max(dis.task_id) AS task_id,
max(dis.storagevehicle_code) AS storagevehicle_code,
max(dis.point_id) AS point_id,
max(attr.out_order_seq) AS out_order_seq,
max(attr.block_num) AS block_num,
max(attr.row_num) AS row_num
FROM
ST_IVT_IOStorInvDis dis
LEFT JOIN st_ivt_structattr attr ON dis.struct_id = attr.struct_id
WHERE
dis.work_status = '00'
OPTION 输入.iostorinvdtl_id <> ""
dis.iostorinvdtl_id = 输入.iostorinvdtl_id
ENDOPTION
OPTION 输入.iostorinvdis_id <> ""
dis.iostorinvdis_id = 输入.iostorinvdis_id
ENDOPTION
OPTION 输入.block_num <> ""
attr.block_num = 输入.block_num
ENDOPTION
OPTION 输入.row_num <> ""
attr.row_num = 输入.row_num
ENDOPTION
group by attr.struct_id
order by attr.out_order_seq ASC
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "22"
QUERY
SELECT
max(dis.iostorinvdis_id) AS iostorinvdis_id,
max(dis.iostorinv_id) AS iostorinv_id,
max(dis.iostorinvdtl_id) AS iostorinvdtl_id,
max(dis.seq_no) AS seq_no,
max(dis.sect_id) AS sect_id,
max(dis.sect_code) AS sect_code,
max(dis.sect_name) AS sect_name,
max(dis.struct_id) AS struct_id,
max(dis.struct_code) AS struct_code,
max(dis.struct_name) AS struct_name,
max(dis.struct_name) AS struct_name,
max(dis.material_id) AS material_id,
max(dis.pcsn) AS pcsn,
max(dis.box_no) AS box_no,
max(dis.task_id) AS task_id,
max(dis.storagevehicle_code) AS storagevehicle_code,
max(dis.point_id) AS point_id,
max(attr.out_order_seq) AS out_order_seq,
max(attr.block_num) AS block_num,
max(attr.row_num) AS row_num
FROM
ST_IVT_IOStorInvDis dis
LEFT JOIN st_ivt_structattr attr ON dis.struct_id = attr.struct_id
WHERE
dis.work_status = '00'
OPTION 输入.iostorinvdis_id <> ""
dis.iostorinvdis_id = 输入.iostorinvdis_id
ENDOPTION
OPTION 输入.iostorinvdtl_id <> ""
dis.iostorinvdtl_id = 输入.iostorinvdtl_id
ENDOPTION
OPTION 输入.block_num <> ""
attr.block_num = 输入.block_num
ENDOPTION
OPTION 输入.row_num <> ""
attr.row_num = 输入.row_num
ENDOPTION
group by attr.struct_id
order by attr.out_order_seq DESC
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "3"
QUERY
SELECT
attr.*
FROM
st_ivt_structattr attr
WHERE
attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.out_order_seq < 输入.out_order_seq
AND IFNULL( attr.storagevehicle_code, '' ) <> ''
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "4"
QUERY
SELECT
attr.*
FROM
st_ivt_structattr attr
WHERE
attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.out_order_seq > 输入.out_order_seq
AND IFNULL( attr.storagevehicle_code, '' ) <> ''
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "5"
QUERY
SELECT
attr.*
FROM
st_ivt_structattr attr
WHERE
attr.lock_type in ('2','3','6','7')
AND attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.out_order_seq > 输入.out_order_seq
AND IFNULL( attr.storagevehicle_code, '' ) <> ''
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "6"
QUERY
SELECT
attr.*
FROM
st_ivt_structattr attr
WHERE
attr.lock_type in ('2','3','6','7')
AND attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.out_order_seq < 输入.out_order_seq
AND IFNULL( attr.storagevehicle_code, '' ) <> ''
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "7"
QUERY
SELECT
attr.*
FROM
st_ivt_structattr attr
WHERE
attr.lock_type = '1'
AND attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.out_order_seq > 输入.out_order_seq
AND IFNULL( attr.storagevehicle_code, '' ) <> ''
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "8"
QUERY
SELECT
attr.*
FROM
st_ivt_structattr attr
WHERE
attr.lock_type = '1'
AND attr.block_num = 输入.block_num
AND attr.row_num = 输入.row_num
AND attr.out_order_seq < 输入.out_order_seq
AND IFNULL( attr.storagevehicle_code, '' ) <> ''
ENDSELECT
ENDQUERY
ENDIF