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-06 14:32:53 +08:00
parent 2cda82fa09 e05823a488
commit 8eb2294792
11 changed files with 109 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java
View File

@@ -62,10 +62,10 @@ public class SecurityUtils {
}
/**
* 获取系统用户Id
*
* @return 系统用户Id
* 获取系统用户部门Id
* @return 用户部门现在1：n，该方法禁用
*/
@Deprecated
public static Long getDeptId() {
// return getCurrentUser().getUser().getDept().getId();
return 1L;

3
lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
View File

@@ -135,6 +135,9 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
}catch (Exception ex){
throw new RuntimeException();
}
if ("123456".equals(sysUser.getPassword())){
sysUser.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
}
sysUser.setUpdateTime(new Date());
sysUser.setUpdateId(SecurityUtils.getCurrentUserId());
this.updateById(sysUser);

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

@@ -44,6 +44,7 @@ public class OutTask extends AbstractAcsTask {
*/
//任务表
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject dis_tab = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
@@ -89,6 +90,11 @@ public class OutTask extends AbstractAcsTask {
resultList.add(dto);
}
}
// 更新分配明细执行状态为：执行中
JSONObject paramMap = new JSONObject();
paramMap.put("work_status", "02");
dis_tab.update(paramMap,"task_id ='"+json.getString("task_id")+"'");
}
return resultList;
}
@@ -124,7 +130,7 @@ public class OutTask extends AbstractAcsTask {
String task_group_id = jsonTask.getString("task_group_id");
if (ObjectUtil.isNotEmpty(task_group_id)) {
// 上一个任务组顺序号
String sort_seq_last = NumberUtil.sub(jsonTask.getString("sort_seq"), "1").toString();
String sort_seq_last = NumberUtil.add(jsonTask.getString("sort_seq"), "1").toString();
JSONObject jsonTaskLast = taskTab.query("task_group_id = '" + task_group_id + "' and sort_seq = '" + sort_seq_last + "' and task_status <> '07'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务！");

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

@@ -206,4 +206,10 @@ public interface CheckOutBillService {
JSONArray queryBox(JSONObject whereJson);
JSONArray getOutBillTask2(Map whereJson);
/**
* 删除任务
* @param whereJson /
*/
void cancelTask(JSONObject whereJson);
}

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

@@ -98,6 +98,13 @@ public class CheckOutBillController {
checkOutBillService.allCancel(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/cancelTask")
@Log("删除任务")
@ApiOperation("删除任务")
public ResponseEntity<Object> cancelTask(@RequestBody JSONObject whereJson) {
checkOutBillService.cancelTask(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/oneCancel")
@Log("出库单全部取消")
@ApiOperation("出库单全部取消")

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

@@ -596,6 +596,26 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
return jo;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelTask(JSONObject whereJson) {
WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 分配表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表
String task_id = whereJson.getString("task_id");
// 更新分配明细 任务状态、清空任务id
JSONObject paramMap = new JSONObject();
paramMap.put("task_id", "");
paramMap.put("work_status", "00");
paramMap.put("point_id", "");
disTab.update(paramMap,"task_id = '"+task_id+"'");
// 删除此任务
JSONObject paramMap2 = new JSONObject();
paramMap2.put("is_delete","1" );
taskTab.update(paramMap2,"task_id = '"+task_id+"'");
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(JSONObject whereJson) {
@@ -853,6 +873,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonMap.put("flag", "1");
jsonMap.put("material_id", dtl.getString("material_id"));
jsonMap.put("pcsn", dtl.getString("pcsn"));
jsonMap.put("box_no", dtl.getString("box_no"));
jsonMap.put("sect_id", whereJson.getString("sect_id"));
jsonMap.put("stor_id", whereJson.getString("stor_id"));
@@ -1072,6 +1093,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonMap.put("flag", "1");
jsonMap.put("material_id", dtl.getString("material_id"));
jsonMap.put("pcsn", dtl.getString("pcsn"));
jsonMap.put("box_no", dtl.getString("box_no"));
jsonMap.put("sect_id", whereJson.getString("sect_id"));
jsonMap.put("stor_id", whereJson.getString("stor_id"));
@@ -1919,14 +1941,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
boolean left_verify = true;
if (ObjectUtil.isEmpty(jsonIsBlockL)) {
left_verify = false;
String out_order_seq = NumberUtil.add(jsonAttr.getString("out_order_seq"), "1").toString();
/* String out_order_seq = NumberUtil.add(jsonAttr.getString("out_order_seq"), "1").toString();
JSONObject json = attrTab.query("sect_id = '" + map.getString("sect_id")
+ "' and out_order_seq = '" + out_order_seq
+ "' and block_num = '" + jsonAttr.getString("block_num")
+ "' and row_num = '" + jsonAttr.getString("row_num") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {
jsonAttr.put("placement_type","02");
}
}*/
jsonAttr.put("placement_type","02");
} else {
// 调用验证方法进行校验
String out_order_seq = NumberUtil.add(jsonIsBlockL.getString("out_order_seq"), "1").toString();
@@ -1962,14 +1985,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
boolean right_verify = true;
if (ObjectUtil.isEmpty(jsonIsBlockR)) {
right_verify = false;
String out_order_seq = NumberUtil.sub(jsonAttr.getString("out_order_seq"), "1").toString();
/* String out_order_seq = NumberUtil.sub(jsonAttr.getString("out_order_seq"), "1").toString();
JSONObject json = attrTab.query("sect_id = '" + map.getString("sect_id")
+ "' and out_order_seq = '" + out_order_seq
+ "' and block_num = '" + jsonAttr.getString("block_num")
+ "' and row_num = '" + jsonAttr.getString("row_num") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {
jsonAttr.put("placement_type","03");
}
}*/
jsonAttr.put("placement_type","03");
} else {
// 调用验证方法进行校验
String out_order_seq = NumberUtil.sub(jsonIsBlockR.getString("out_order_seq"), "1").toString();
@@ -3274,41 +3298,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonTask.put("update_time",now);
wo_Task.update(jsonTask);
/* ArrayList<AcsTaskDto> resultList = new ArrayList<>();
// 1.查询此任务是否有任务组
JSONObject jsonTask = wo_Task.query("task_id = '" + whereJson.getString("task_id") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonTask.getString("task_group_id"))) {
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(jsonTask.getString("task_id"))
.task_code(jsonTask.getString("task_code"))
.task_type(jsonTask.getString("acs_task_type"))
.start_device_code(jsonTask.getString("point_code1"))
.next_device_code(jsonTask.getString("point_code2"))
.vehicle_code(jsonTask.getString("vehicle_code"))
.priority(jsonTask.getString("priority"))
.remark(jsonTask.getString("remark"))
.build();
resultList.add(dto);
} else {
// 2.有任务组：按照执行顺序下发 大到小
JSONArray taskArr = wo_Task.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' order by sort_seq DESC").getResultJSONArray(0);
for (int i = 0; i < taskArr.size(); i++) {
JSONObject json = taskArr.getJSONObject(i);
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id"))
.task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority"))
.remark(json.getString("remark"))
.build();
resultList.add(dto);
}
}*/
}
@Override
@@ -3332,6 +3321,16 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("查询不到操作的任务记录！");
}
// 判断此任务是否有任务组
String task_group_id = task.getString("task_group_id");
if (ObjectUtil.isNotEmpty(task_group_id)) {
// 上一个任务组顺序号
String sort_seq_last = NumberUtil.add(task.getString("sort_seq"), "1").toString();
JSONObject jsonTaskLast = wo_Task.query("task_group_id = '" + task_group_id + "' and sort_seq = '" + sort_seq_last + "' and task_status <> '07'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonTaskLast)) throw new BadRequestException("请先完成"+jsonTaskLast.getString("task_code")+"的任务！");
}
JSONObject dtljo = wo_dis.query("task_id='" + task_id + "'").uniqueResult(0);
whereJson.put("iostorinv_id", dtljo.getString("iostorinv_id"));

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

@@ -168,7 +168,7 @@
ST_IVT_IOStorInvDtl iosdtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id
LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn AND sub.package_box_sn = iosdtl.box_no
WHERE
1=1
OPTION 输入.iostorinv_id <> ""
@@ -634,13 +634,15 @@
task.task_code,
task.task_type,
task.task_status,
sub.sap_pcsn
sub.sap_pcsn,
md.class_name task_type_name
FROM
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
WHERE
1=1
@@ -673,13 +675,15 @@
task.task_code,
task.task_type,
task.task_status,
sub.sap_pcsn
sub.sap_pcsn,
md.class_name task_type_name
FROM
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name
LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name AND sub.package_box_sn = dis.box_no
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
WHERE
1=1

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

@@ -24,6 +24,7 @@
输入.iostorinv_id TYPEAS s_string
输入.iostorinvdtl_id TYPEAS s_string
输入.stor_id TYPEAS s_string
输入.box_no TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -73,6 +74,10 @@
ivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.box_no <> ""
attr.storagevehicle_code = 输入.box_no
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name = 输入.sale_order_name
ENDOPTION