|
|
|
@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
@ -17,7 +18,6 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.nl.b_lms.pdm.storagevehicleext.service.IMdPbStoragevehicleextService; |
|
|
|
import org.nl.b_lms.sch.task.dao.SchBaseTask; |
|
|
|
import org.nl.b_lms.sch.task.service.IschBaseTaskService; |
|
|
|
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; |
|
|
|
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtMoveinvService; |
|
|
|
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtMoveinvdtlService; |
|
|
|
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtMoveinv; |
|
|
|
@ -32,11 +32,15 @@ import org.nl.modules.common.exception.BadRequestException; |
|
|
|
import org.nl.modules.wql.WQL; |
|
|
|
import org.nl.modules.wql.core.bean.WQLObject; |
|
|
|
import org.nl.modules.wql.util.WqlUtil; |
|
|
|
import org.nl.system.service.dict.ISysDictService; |
|
|
|
import org.nl.system.service.dict.dao.Dict; |
|
|
|
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; |
|
|
|
import org.nl.wms.sch.manage.TaskStatusEnum; |
|
|
|
import org.nl.wms.st.inbill.service.StorPublicService; |
|
|
|
import org.nl.wms.st.instor.service.HandMoveStorService; |
|
|
|
import org.nl.wms.st.instor.service.dto.MoveInvPageParam; |
|
|
|
import org.nl.wms.st.instor.service.dto.MoveStockInfoDto; |
|
|
|
import org.nl.wms.st.instor.service.vo.MoveChooseMaterialVo; |
|
|
|
import org.nl.wms.st.instor.task.HandMoveStorAcsTask; |
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
@ -65,8 +69,10 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
* 任务表 |
|
|
|
*/ |
|
|
|
private final IschBaseTaskService taskService; |
|
|
|
/** 移库明细表 */ |
|
|
|
private final IStIvtMoveinvdtlService moveinvdtlService; |
|
|
|
private final IMdPbStoragevehicleextService storagevehicleextService; |
|
|
|
private final ISysDictService dictService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public IPage<StIvtMoveinv> pageQuery(MoveInvPageParam param, PageQuery page) { |
|
|
|
@ -423,13 +429,8 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public JSONArray getOutBillDtl(Map whereJson) { |
|
|
|
whereJson.put("flag", "2"); |
|
|
|
JSONArray jo = WQL.getWO("QST_IVT_HANDMOVESTOR") |
|
|
|
.addParamMap((HashMap) whereJson) |
|
|
|
.process() |
|
|
|
.getResultJSONArray(0); |
|
|
|
return jo; |
|
|
|
public List<JSONObject> getOutBillDtl(Map whereJson) { |
|
|
|
return moveinvdtlService.getOutBillDtl(whereJson); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -567,88 +568,59 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, Object> getStructIvt(Map whereJson, Pageable page) { |
|
|
|
HashMap<String, String> map = new HashMap<String, String>(whereJson); |
|
|
|
if (StrUtil.isNotEmpty(map.get("remark"))) { |
|
|
|
map.put("remark", "%" + map.get("remark") + "%"); |
|
|
|
} |
|
|
|
if (StrUtil.isNotEmpty(map.get("struct_code"))) { |
|
|
|
map.put("struct_code", "%" + map.get("struct_code") + "%"); |
|
|
|
} |
|
|
|
|
|
|
|
public IPage<MoveChooseMaterialVo> getStructIvt(MoveInvPageParam map, PageQuery page) { |
|
|
|
// 空格查询
|
|
|
|
if (StrUtil.isNotEmpty(map.get("pcsn"))) { |
|
|
|
if (StrUtil.isNotEmpty(map.getPcsn())) { |
|
|
|
// 判断是否有空格
|
|
|
|
String pcsn = MapUtil.getStr(map, "pcsn"); |
|
|
|
String pcsn = map.getPcsn(); |
|
|
|
|
|
|
|
boolean matches = pcsn.matches(".*\\s.*"); |
|
|
|
|
|
|
|
if (matches) { |
|
|
|
String[] s = pcsn.split(" "); |
|
|
|
String pcsn_in = String.join("','", Arrays.asList(s)); |
|
|
|
|
|
|
|
map.put("pcsn_in", "('" + pcsn_in + "')"); |
|
|
|
map.put("pcsn", ""); |
|
|
|
} else { |
|
|
|
map.put("pcsn", "%" + map.get("pcsn") + "%"); |
|
|
|
String[] pcsns = pcsn.split(" "); |
|
|
|
List<String> pcsnList = new ArrayList<>(Arrays.asList(pcsns)); |
|
|
|
map.setPcsns(pcsnList); |
|
|
|
map.setPcsn(""); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 空格查询
|
|
|
|
if (StrUtil.isNotEmpty(map.get("sap_pcsn"))) { |
|
|
|
if (StrUtil.isNotEmpty(map.getSap_pcsn())) { |
|
|
|
// 判断是否有空格
|
|
|
|
String sap_pcsn = MapUtil.getStr(map, "sap_pcsn"); |
|
|
|
String sap_pcsn = map.getSap_pcsn(); |
|
|
|
|
|
|
|
boolean matches = sap_pcsn.matches(".*\\s.*"); |
|
|
|
|
|
|
|
if (matches) { |
|
|
|
String[] s = sap_pcsn.split(" "); |
|
|
|
String sap_pcsn_in = String.join("','", Arrays.asList(s)); |
|
|
|
|
|
|
|
map.put("sap_pcsn_in", "('" + sap_pcsn_in + "')"); |
|
|
|
map.put("sap_pcsn", ""); |
|
|
|
} else { |
|
|
|
map.put("sap_pcsn", "%" + map.get("sap_pcsn") + "%"); |
|
|
|
List<String> sapList = new ArrayList<>(Arrays.asList(s)); |
|
|
|
map.setSap_pcsns(sapList); |
|
|
|
map.setSap_pcsn(""); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 空格查询
|
|
|
|
if (StrUtil.isNotEmpty(map.get("package_box_sn"))) { |
|
|
|
if (StrUtil.isNotEmpty(map.getPackage_box_sn())) { |
|
|
|
// 判断是否有空格
|
|
|
|
String package_box_sn = MapUtil.getStr(map, "package_box_sn"); |
|
|
|
String package_box_sn = map.getPackage_box_sn(); |
|
|
|
|
|
|
|
boolean matches = package_box_sn.matches(".*\\s.*"); |
|
|
|
|
|
|
|
if (matches) { |
|
|
|
String[] s = package_box_sn.split(" "); |
|
|
|
String box_no_in = String.join("','", Arrays.asList(s)); |
|
|
|
|
|
|
|
map.put("package_box_sn_in", "('" + box_no_in + "')"); |
|
|
|
map.put("package_box_sn", ""); |
|
|
|
} else { |
|
|
|
map.put("package_box_sn", "%" + map.get("package_box_sn") + "%"); |
|
|
|
|
|
|
|
List<String> boxList = new ArrayList<>(Arrays.asList(s)); |
|
|
|
map.setPackage_box_sns(boxList); |
|
|
|
map.setPackage_box_sn(""); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(map.get("sale_order_name"))) { |
|
|
|
map.put("sale_order_name", "%" + map.get("sale_order_name") + "%"); |
|
|
|
} |
|
|
|
|
|
|
|
//获取人员对应的仓库
|
|
|
|
UserStorServiceImpl userStorService = new UserStorServiceImpl(); |
|
|
|
String in_stor_id = userStorService.getInStor(); |
|
|
|
List<String> storIds = bsrealstorattrService.getStoreForUser(SecurityUtils.getCurrentUserId()); |
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(in_stor_id)) { |
|
|
|
map.put("in_stor_id", in_stor_id); |
|
|
|
if (ObjectUtil.isNotEmpty(storIds)) { |
|
|
|
map.setIn_stor_id(storIds); |
|
|
|
} |
|
|
|
|
|
|
|
JSONObject jo = WQL.getWO("QST_IVT_HANDMOVESTOR") |
|
|
|
.addParam("flag", "3") |
|
|
|
.addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt2.struct_id"); |
|
|
|
return jo; |
|
|
|
return structattrService.getStructIvtPage(map, page); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public JSONArray getBoxIvt(JSONArray whereJson) { |
|
|
|
JSONArray total_rows = new JSONArray(); |
|
|
|
@ -660,9 +632,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
} |
|
|
|
|
|
|
|
for (String s : set) { |
|
|
|
JSONArray rows = WQL.getWO("QST_IVT_HANDMOVESTOR") |
|
|
|
.addParam("flag", "5") |
|
|
|
.addParam("storagevehicle_code", s).process().getResultJSONArray(0); |
|
|
|
JSONArray rows = structattrService.getVehiclesStorageByCode(s); |
|
|
|
for (int i = 0; i < rows.size(); i++) { |
|
|
|
JSONObject mater = rows.getJSONObject(i); |
|
|
|
total_rows.add(mater); |
|
|
|
@ -674,38 +644,35 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void confirm(JSONObject form) { |
|
|
|
//明细表
|
|
|
|
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_MoveInvDtl"); |
|
|
|
//主表
|
|
|
|
WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_MoveInv"); |
|
|
|
//任务表
|
|
|
|
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); |
|
|
|
|
|
|
|
// 移库单id
|
|
|
|
String moveinv_id = form.getString("moveinv_id"); |
|
|
|
String currentUserId = SecurityUtils.getCurrentUserId(); |
|
|
|
String nickName = SecurityUtils.getCurrentNickName(); |
|
|
|
|
|
|
|
String now = DateUtil.now(); |
|
|
|
//查询主表信息
|
|
|
|
JSONObject jo_mst = wo_mst.query("moveinv_id = '" + moveinv_id + "'").uniqueResult(0); |
|
|
|
if (ObjectUtil.isEmpty(jo_mst)) { |
|
|
|
StIvtMoveinv moveOrder = moveinvService.getById(moveinv_id); |
|
|
|
if (ObjectUtil.isEmpty(moveOrder)) { |
|
|
|
throw new BadRequestException("未查到相关移库单"); |
|
|
|
} |
|
|
|
//判断是否存在未确认状态的明细记录
|
|
|
|
JSONObject task = wo_dtl.query("work_status ='02' and moveinv_id = '" + moveinv_id + "'").uniqueResult(0); |
|
|
|
if (ObjectUtil.isNotEmpty(task)) { |
|
|
|
List<StIvtMoveinvdtl> moveTasks = moveinvdtlService.list(new LambdaUpdateWrapper<StIvtMoveinvdtl>() |
|
|
|
.eq(StIvtMoveinvdtl::getWork_status, "02") |
|
|
|
.eq(StIvtMoveinvdtl::getMoveinv_id, moveinv_id)); |
|
|
|
if (moveTasks.size() > 0) { |
|
|
|
throw new BadRequestException("存在已下发未完成的移库任务，不允许强制确认！"); |
|
|
|
} |
|
|
|
JSONArray ja = wo_dtl.query("moveinv_id='" + moveinv_id + "'").getResultJSONArray(0); |
|
|
|
List<JSONObject> ja = moveinvdtlService.getByMoveInvIdToObject(moveinv_id); |
|
|
|
for (int i = 0; i < ja.size(); i++) { |
|
|
|
JSONObject jo = ja.getJSONObject(i); |
|
|
|
JSONObject jo = ja.get(i); |
|
|
|
//删除任务
|
|
|
|
HashMap<String, String> task_map = new HashMap<>(); |
|
|
|
task_map.put("task_status", "07"); |
|
|
|
task_map.put("update_optid", currentUserId + ""); |
|
|
|
task_map.put("update_optname", nickName); |
|
|
|
task_map.put("update_time", now); |
|
|
|
wo_Task.update(task_map, "task_id='" + jo.getString("task_id") + "'"); |
|
|
|
LambdaUpdateWrapper<SchBaseTask> taskUpLam = new LambdaUpdateWrapper<>(); |
|
|
|
taskUpLam.set(SchBaseTask::getTask_status, "07") |
|
|
|
.set(SchBaseTask::getUpdate_optid, currentUserId) |
|
|
|
.set(SchBaseTask::getUpdate_optname, nickName) |
|
|
|
.set(SchBaseTask::getUpdate_time, now) |
|
|
|
.eq(SchBaseTask::getTask_id, jo.getString("task_id")); |
|
|
|
taskService.update(taskUpLam); |
|
|
|
//解锁起点点位、仓位,清除载具
|
|
|
|
JSONObject from_start = new JSONObject(); |
|
|
|
from_start.put("lock_type", "1"); |
|
|
|
@ -730,29 +697,27 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
//更新移出库存
|
|
|
|
jo.put("struct_id", jo.getString("turnout_struct_id")); |
|
|
|
jo.put("change_qty", jo.getDoubleValue("qty")); |
|
|
|
jo.put("bill_type_scode", jo_mst.getString("bill_type")); |
|
|
|
jo.put("bill_type_scode", moveOrder.getBill_type()); |
|
|
|
jo.put("inv_id", jo.getString("moveinvdtl_id")); |
|
|
|
jo.put("bill_code", jo_mst.getString("bill_code")); |
|
|
|
jo.put("bill_code", moveOrder.getBill_code()); |
|
|
|
jo.put("bill_table", "ST_IVT_MoveInv"); |
|
|
|
storPublicService.IOStor(jo, "21"); |
|
|
|
//更新移入库存
|
|
|
|
jo.put("struct_id", jo.getString("turnin_struct_id")); |
|
|
|
jo.put("bill_type_scode", jo_mst.getString("bill_type")); |
|
|
|
jo.put("bill_type_scode", moveOrder.getBill_type()); |
|
|
|
jo.put("inv_id", jo.getString("moveinvdtl_id")); |
|
|
|
jo.put("bill_code", jo_mst.getString("bill_code")); |
|
|
|
jo.put("bill_code", moveOrder.getBill_code()); |
|
|
|
jo.put("bill_table", "ST_IVT_MoveInv"); |
|
|
|
storPublicService.IOStor(jo, "33"); |
|
|
|
//更新明细
|
|
|
|
jo.put("work_status", "99"); |
|
|
|
wo_dtl.update(jo); |
|
|
|
moveinvdtlService.updateById(jo.toJavaObject(StIvtMoveinvdtl.class)); |
|
|
|
} |
|
|
|
HashMap<String, String> map_mst = new HashMap<>(); |
|
|
|
map_mst.put("bill_status", "99"); |
|
|
|
map_mst.put("confirm_optid", currentUserId + ""); |
|
|
|
map_mst.put("confirm_optname", nickName); |
|
|
|
map_mst.put("confirm_time", now); |
|
|
|
//更新主表状态
|
|
|
|
wo_mst.update(map_mst, "moveinv_id='" + moveinv_id + "'"); |
|
|
|
moveOrder.setBill_status("99"); |
|
|
|
moveOrder.setUpdate_optid(currentUserId); |
|
|
|
moveOrder.setUpdate_optname(nickName); |
|
|
|
moveOrder.setUpdate_time(now); |
|
|
|
moveinvService.updateById(moveOrder); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -948,54 +913,48 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void handdown(JSONObject whereJson) { |
|
|
|
//移库单主表
|
|
|
|
WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_MoveInv"); |
|
|
|
//移库单明细表
|
|
|
|
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_MoveInvDtl"); |
|
|
|
//任务表
|
|
|
|
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); |
|
|
|
//仓位表
|
|
|
|
WQLObject wo_attr = WQLObject.getWQLObject("st_ivt_structattr"); |
|
|
|
|
|
|
|
HandMoveStorAcsTask handMoveStorAcsTask = new HandMoveStorAcsTask(); |
|
|
|
|
|
|
|
String currentUserId = SecurityUtils.getCurrentUserId(); |
|
|
|
String nickName = SecurityUtils.getCurrentNickName(); |
|
|
|
String now = DateUtil.now(); |
|
|
|
|
|
|
|
String moveinv_id = whereJson.getString("moveinv_id"); |
|
|
|
String bill_type = whereJson.getString("bill_type"); |
|
|
|
|
|
|
|
//查询所有载具的库存
|
|
|
|
JSONArray ja = WQL.getWO("QST_IVT_HANDMOVESTOR") |
|
|
|
.addParam("flag", "4") |
|
|
|
.addParam("moveinv_id", moveinv_id) |
|
|
|
.process().getResultJSONArray(0); |
|
|
|
if (ja.size() == 0) { |
|
|
|
List<MoveStockInfoDto> stockTaskInfo = moveinvService.getMoveStockInfoByInvId(moveinv_id); |
|
|
|
if (stockTaskInfo.size() == 0) { |
|
|
|
throw new BadRequestException("当前移库单无可下发任务！"); |
|
|
|
} |
|
|
|
for (int i = 0; i < ja.size(); i++) { |
|
|
|
JSONObject jo = ja.getJSONObject(i); |
|
|
|
String task_id = jo.getString("task_id"); |
|
|
|
|
|
|
|
JSONObject task = wo_Task.query("task_id='" + task_id + "'").uniqueResult(0); |
|
|
|
task.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); |
|
|
|
wo_Task.update(task); |
|
|
|
|
|
|
|
for (int i = 0; i < stockTaskInfo.size(); i++) { |
|
|
|
MoveStockInfoDto moveStockInfoDto = stockTaskInfo.get(i); |
|
|
|
String task_id = moveStockInfoDto.getTask_id(); |
|
|
|
boolean update = taskService.update(new LambdaUpdateWrapper<SchBaseTask>() |
|
|
|
.set(SchBaseTask::getTask_status, TaskStatusEnum.START_AND_POINT.getCode()) |
|
|
|
.eq(SchBaseTask::getTask_id, task_id)); |
|
|
|
log.info("任务-{}更新情况：", task_id, update); |
|
|
|
// 下发任务
|
|
|
|
JSONObject result = handMoveStorAcsTask.immediateNotifyAcs(task_id); |
|
|
|
if (ObjectUtil.isNotEmpty(result)) { |
|
|
|
String status = result.getString("status"); |
|
|
|
if ("200".equals(status)) { |
|
|
|
HashMap<String, String> map = new HashMap<>(); |
|
|
|
// 下发成功
|
|
|
|
//更新分配表
|
|
|
|
map.put("is_issued", "1"); |
|
|
|
map.put("work_status", "02"); |
|
|
|
wo_dtl.update(map, "is_issued='0' and task_id='" + task.getString("task_id") + "'"); |
|
|
|
LambdaUpdateWrapper<StIvtMoveinvdtl> moveDtlUpLam = new LambdaUpdateWrapper<>(); |
|
|
|
moveDtlUpLam.set(StIvtMoveinvdtl::getIs_issued, "1") |
|
|
|
.set(StIvtMoveinvdtl::getWork_status, "02") |
|
|
|
.eq(StIvtMoveinvdtl::getIs_issued, "0") |
|
|
|
.eq(StIvtMoveinvdtl::getTask_id, task_id); |
|
|
|
moveinvdtlService.update(moveDtlUpLam); |
|
|
|
//更新任务为已下发
|
|
|
|
map.put("task_status", "05"); |
|
|
|
map.put("update_optid", currentUserId + ""); |
|
|
|
map.put("update_optname", nickName); |
|
|
|
map.put("update_time", now); |
|
|
|
wo_Task.update(map, "is_delete ='0' and task_id='" + task_id + "'"); |
|
|
|
LambdaUpdateWrapper<SchBaseTask> taskUpLam = new LambdaUpdateWrapper<>(); |
|
|
|
taskUpLam.set(SchBaseTask::getTask_status, "05") |
|
|
|
.set(SchBaseTask::getUpdate_optid, currentUserId) |
|
|
|
.set(SchBaseTask::getUpdate_optname, nickName) |
|
|
|
.set(SchBaseTask::getUpdate_time, now) |
|
|
|
.eq(SchBaseTask::getIs_delete, "0") |
|
|
|
.eq(SchBaseTask::getTask_id, task_id); |
|
|
|
taskService.update(taskUpLam); |
|
|
|
} else { |
|
|
|
throw new BadRequestException("任务下发失败，请稍后重试！"); |
|
|
|
} |
|
|
|
@ -1003,14 +962,18 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { |
|
|
|
throw new BadRequestException("任务下发失败，请稍后重试！"); |
|
|
|
} |
|
|
|
} |
|
|
|
HashMap<String, String> map = new HashMap<>(); |
|
|
|
map.put("bill_status", "20"); |
|
|
|
wo_mst.update(map, "moveinv_id='" + moveinv_id + "'"); |
|
|
|
// 更新主表状态
|
|
|
|
LambdaUpdateWrapper<StIvtMoveinv> moveInvUpLam = new LambdaUpdateWrapper<>(); |
|
|
|
moveInvUpLam.set(StIvtMoveinv::getBill_code, "20") |
|
|
|
.eq(StIvtMoveinv::getMoveinv_id, moveinv_id); |
|
|
|
moveinvService.update(moveInvUpLam); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public JSONArray getInvTypes() { |
|
|
|
//查询单据字段类型
|
|
|
|
// List<Dict> list = dictService.list(new QueryWrapper<Dict>().select("max(value) AS CODE",
|
|
|
|
// "max(label) AS NAME").like("code", "INV_TYPE").orderByAsc("value"));
|
|
|
|
JSONArray ja = WQL.getWO("ST_PUB_QUERY_01") |
|
|
|
.addParam("flag", "4") |
|
|
|
.process() |
|
|
|
|
