opt:预装业务变动,送满回空业务逻辑优化;
This commit is contained in:
@@ -36,7 +36,7 @@ public class GateWayController {
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/apply")
|
||||
@PostMapping("/feedback")
|
||||
@Log(value = "RCS给WMS反馈任务状态")
|
||||
@SaIgnore
|
||||
public ResponseEntity<Object> receiveTaskStatus(@RequestBody FeedBackTaskDto param) {
|
||||
|
||||
@@ -157,6 +157,7 @@ public class GateWayServiceImpl implements IGateWayService {
|
||||
if (rcsStatusEnum == null) {
|
||||
throw new BadRequestException("反馈的任务状态码不受支持: " + rcsTaskStatus);
|
||||
}
|
||||
log.info("rcs反馈的任务编号为:{},状态码为:{} ", orderId, rcsTaskStatus);
|
||||
TaskStatus status;
|
||||
switch (rcsStatusEnum) {
|
||||
case EXECUTING:
|
||||
@@ -183,10 +184,10 @@ public class GateWayServiceImpl implements IGateWayService {
|
||||
default:
|
||||
throw new BadRequestException("反馈的任务状态码不受支持: " + rcsStatusEnum.getName());
|
||||
}
|
||||
log.info("rcs反馈任务状态,任务编号为:{},状态码为:{} ", orderId, status.getName());
|
||||
// 根据配置编码执行相关配置内的方法
|
||||
AbstractTask task = taskFactory.getTask(taskObj.getConfig_code());
|
||||
task.updateTaskStatus(taskObj.getTask_code(), status);
|
||||
|
||||
} else {
|
||||
throw new BadRequestException("任务编号为:" + orderId + "的任务正在执行逻辑处理中!");
|
||||
}
|
||||
|
||||
@@ -5,8 +5,12 @@ import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.common.exception.BadRequestException;
|
||||
import org.nl.common.logging.annotation.Log;
|
||||
import org.nl.common.utils.MapOf;
|
||||
import org.nl.common.utils.RedissonUtils;
|
||||
import org.nl.system.service.param.ISysParamService;
|
||||
import org.nl.system.service.param.dao.Param;
|
||||
import org.nl.wms.pda.ios_manage.service.PdaIosOutService;
|
||||
import org.nl.wms.pda.util.PdaResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -17,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.*;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.nl.common.utils.ValidationUtil.assertNotBlankJson;
|
||||
|
||||
/**
|
||||
@@ -31,7 +39,8 @@ import static org.nl.common.utils.ValidationUtil.assertNotBlankJson;
|
||||
@SaIgnore
|
||||
@Slf4j
|
||||
public class PdaIosOutController {
|
||||
|
||||
@Autowired
|
||||
private ISysParamService iSysParamService;
|
||||
@Autowired
|
||||
private PdaIosOutService pdaIosOutService;
|
||||
|
||||
@@ -75,7 +84,7 @@ public class PdaIosOutController {
|
||||
@PostMapping("/callMaterialConfirm")
|
||||
@Log("产线叫料出库点确认")
|
||||
public ResponseEntity<Object> callMaterialConfirm(@RequestBody JSONObject whereJson) {
|
||||
assertNotBlankJson(whereJson, "请求参数不能为空", "group_id", "storagevehicle_code", "siteCode", "struct_code");
|
||||
assertNotBlankJson(whereJson, "请求参数不能为空", "region_code", "siteCode");
|
||||
RedissonUtils.lock(() -> {
|
||||
pdaIosOutService.callMaterialConfirm(whereJson);
|
||||
}, "callMaterialConfirm" + whereJson.getString("group_id"), null);
|
||||
@@ -119,10 +128,85 @@ public class PdaIosOutController {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@PostMapping("/update")
|
||||
@Log("获取升级地址")
|
||||
public ResponseEntity<Map> apkUrl() {
|
||||
Map of = MapOf.of("versionName", "1.0.1", "url", "http://192.168.18.218:8012/api/pda/download/app-release");
|
||||
return new ResponseEntity<>(of, HttpStatus.OK);
|
||||
}
|
||||
|
||||
@RequestMapping("/download/app-release")
|
||||
@SaIgnore
|
||||
public void setPrint(HttpServletResponse response) {
|
||||
Param byCode = iSysParamService.findByCode("apkurl");
|
||||
if (byCode == null) {
|
||||
throw new BadRequestException("更新失败:为配置apk下载地址");
|
||||
}
|
||||
System.out.println(byCode.getValue());
|
||||
try {
|
||||
downloadFile(response, byCode.getValue(), "release");
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 附件下载
|
||||
*
|
||||
* @param response
|
||||
* @param fileName
|
||||
* @param path
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public void downloadFile(HttpServletResponse response, String path, String fileName) throws Exception {
|
||||
if (fileName != null) {
|
||||
//设置文件路径
|
||||
File file = new File(path);
|
||||
if (file.exists()) {
|
||||
response.setHeader("content-type", "application/octet-stream");
|
||||
response.setContentType("application/octet-stream");
|
||||
try {
|
||||
response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("utf-8"), "ISO-8859-1") + ".apk");
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
byte[] buffer = new byte[1024];
|
||||
FileInputStream fis = null;
|
||||
BufferedInputStream bis = null;
|
||||
try {
|
||||
fis = new FileInputStream(file);
|
||||
bis = new BufferedInputStream(fis);
|
||||
OutputStream os = response.getOutputStream();
|
||||
int i = bis.read(buffer);
|
||||
while (i != -1) {
|
||||
os.write(buffer, 0, i);
|
||||
i = bis.read(buffer);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if (bis != null) {
|
||||
try {
|
||||
bis.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
if (fis != null) {
|
||||
try {
|
||||
fis.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -225,8 +225,8 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
JSONObject taskForm = new JSONObject();
|
||||
taskForm.put("task_type", "STOutTask");
|
||||
taskForm.put("TaskCode", CodeUtil.getNewCode("TASK_CODE"));
|
||||
taskForm.put("PickingLocation", json.getString("struct_code"));
|
||||
taskForm.put("PlacedLocation", whereJson.getString("siteCode"));
|
||||
taskForm.put("point_code1", json.getString("struct_code"));
|
||||
taskForm.put("point_code2", whereJson.getString("siteCode"));
|
||||
taskForm.put("vehicle_code", json.getString("storagevehicle_code"));
|
||||
StOutTask stOutTask = SpringContextHolder.getBean("STOutTask");
|
||||
String taskId = stOutTask.create(taskForm);
|
||||
@@ -246,48 +246,33 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
@Override
|
||||
@Transactional
|
||||
public PdaResponse callMaterialConfirm(JSONObject whereJson) {
|
||||
//创建出库单/明细/分配
|
||||
GroupPlate plateDao = mdPbGroupplateMapper.selectOne(
|
||||
new LambdaQueryWrapper<GroupPlate>()
|
||||
.eq(GroupPlate::getGroup_id, whereJson.getString("group_id")));
|
||||
Structattr sectDao = iStructattrService.getOne(new LambdaQueryWrapper<Structattr>()
|
||||
.eq(Structattr::getStruct_code, whereJson.getString("struct_code")));
|
||||
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(plateDao.getMaterial_id());
|
||||
whereJson.put("material_id", materDao.getMaterial_id());
|
||||
whereJson.put("material_code", materDao.getMaterial_code());
|
||||
whereJson.put("store_id", sectDao.getStor_id());
|
||||
whereJson.put("store_code", sectDao.getStor_code());
|
||||
whereJson.put("store_name", sectDao.getStor_name());
|
||||
whereJson.put("sec", sectDao.getSect_id());
|
||||
whereJson.put("qty", plateDao.getQty());
|
||||
whereJson.put("pcsn", plateDao.getPcsn());
|
||||
whereJson.put("unit_id", plateDao.getQty_unit_id());
|
||||
whereJson.put("unit_name", plateDao.getQty_unit_name());
|
||||
//创建出库单据
|
||||
String disId = createOutBills(whereJson);
|
||||
JSONObject json = whereJson.getJSONObject("obj");
|
||||
SchBasePoint schBasePoint = iSchBasePointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, whereJson.getString("siteCode")));
|
||||
if (ObjectUtil.isEmpty(schBasePoint)) {
|
||||
throw new BadRequestException("未找到目标:" + whereJson.getString("siteCode") + "的点位信息,请检查");
|
||||
}
|
||||
//锁定货位
|
||||
JSONObject lock_map = new JSONObject();
|
||||
lock_map.put("struct_code", whereJson.getString("struct_code"));
|
||||
lock_map.put("lock_type", IOSEnum.LOCK_TYPE.code("出库锁"));
|
||||
iStructattrService.updateStatusByCode("0", lock_map);
|
||||
// JSONObject lock_map = new JSONObject();
|
||||
// lock_map.put("struct_code", json.getString("struct_code"));
|
||||
// lock_map.put("lock_type", IOSEnum.LOCK_TYPE.code("出库锁"));
|
||||
// iStructattrService.updateStatusByCode("0", lock_map);
|
||||
//创建任务
|
||||
JSONObject taskForm = new JSONObject();
|
||||
taskForm.put("task_type", "STOutTask");
|
||||
taskForm.put("task_type", IOSConstant.PDA_POINT_TASK);
|
||||
taskForm.put("config_code", IOSConstant.PDA_POINT_TASK);
|
||||
taskForm.put("TaskCode", CodeUtil.getNewCode("TASK_CODE"));
|
||||
taskForm.put("PickingLocation", whereJson.getString("struct_code"));
|
||||
taskForm.put("PlacedLocation", whereJson.getString("siteCode"));
|
||||
taskForm.put("vehicle_code", whereJson.getString("storagevehicle_code"));
|
||||
StOutTask stOutTask = SpringContextHolder.getBean("STOutTask");
|
||||
String taskId = stOutTask.create(taskForm);
|
||||
//更新任务id
|
||||
ioStorInvDisMapper.update(new IOStorInvDis(), new LambdaUpdateWrapper<IOStorInvDis>()
|
||||
.set(IOStorInvDis::getTask_id, taskId)
|
||||
.eq(IOStorInvDis::getIostorinvdis_id, disId)
|
||||
);
|
||||
taskForm.put("point_code1", json.getString("struct_code"));
|
||||
taskForm.put("point_code2", whereJson.getString("siteCode"));
|
||||
taskForm.put("vehicle_code", json.getString("storagevehicle_code"));
|
||||
PdaPointTask pdaPointTask = SpringContextHolder.getBean("PdaPointTask");
|
||||
pdaPointTask.create(taskForm);
|
||||
GroupPlate plateDao = mdPbGroupplateMapper.selectOne(
|
||||
new LambdaQueryWrapper<GroupPlate>()
|
||||
.eq(GroupPlate::getStoragevehicle_code, json.getString("storagevehicle_code")).eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库")));
|
||||
//更新组盘记录表
|
||||
mdPbGroupplateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
|
||||
.set(GroupPlate::getFrozen_qty, plateDao.getQty())
|
||||
.eq(GroupPlate::getGroup_id, whereJson.getString("group_id"))
|
||||
.eq(GroupPlate::getGroup_id, json.getString("group_id"))
|
||||
);
|
||||
return PdaResponse.requestOk();
|
||||
}
|
||||
@@ -342,8 +327,8 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
taskForm.put("task_type", IOSConstant.VEHICLE_OUT_TASK);
|
||||
taskForm.put("config_code", IOSConstant.VEHICLE_OUT_TASK);
|
||||
taskForm.put("TaskCode", CodeUtil.getNewCode("TASK_CODE"));
|
||||
taskForm.put("PickingLocation", r.getStruct_code());
|
||||
taskForm.put("PlacedLocation", whereJson.getString("siteCode"));
|
||||
taskForm.put("point_code1", r.getStruct_code());
|
||||
taskForm.put("point_code2", whereJson.getString("siteCode"));
|
||||
taskForm.put("vehicle_code", r.getStoragevehicle_code());
|
||||
applyTaskMap.get(IOSConstant.VEHICLE_OUT_TASK).create(taskForm);
|
||||
});
|
||||
@@ -462,15 +447,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
}
|
||||
LambdaUpdateWrapper<SchBasePoint> wrapper = new LambdaUpdateWrapper<>();
|
||||
if (IOSEnum.BIND_OR_UNBIND.code("绑定").equals(whereJson.getString("mode"))) {
|
||||
if (StringUtils.isNotBlank(sitePoint.getVehicle_code())) {
|
||||
throw new BadRequestException("当前站点已绑定货架:" + sitePoint.getVehicle_code() + ",请先解绑:" + sitePoint.getVehicle_code());
|
||||
}
|
||||
//校验是否在其他站点绑定
|
||||
SchBasePoint shelfPoint = iSchBasePointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getVehicle_code, whereJson.getString("shelfCode")));
|
||||
if (shelfPoint != null) {
|
||||
throw new BadRequestException("当前货架已绑定在站点:" + sitePoint.getPoint_code() + ",请先解绑。");
|
||||
}
|
||||
//绑定库存
|
||||
//查询组盘信息
|
||||
GroupPlate plateDao = mdPbGroupplateMapper.selectOne(
|
||||
new LambdaQueryWrapper<GroupPlate>()
|
||||
.eq(GroupPlate::getStoragevehicle_code, whereJson.getString("shelfCode")).eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")));
|
||||
@@ -478,11 +455,23 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
plateDao.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("入库"));
|
||||
mdPbGroupplateMapper.updateById(plateDao);
|
||||
}
|
||||
if (StringUtils.isNotBlank(sitePoint.getVehicle_code())) {
|
||||
if (sitePoint.getVehicle_code().equals(whereJson.getString("shelfCode"))) {
|
||||
return PdaResponse.requestOk();
|
||||
} else {
|
||||
throw new BadRequestException("当前站点已绑定货架:" + sitePoint.getVehicle_type() + "请先解绑,再绑定!");
|
||||
}
|
||||
}
|
||||
//校验是否在其他站点绑定
|
||||
SchBasePoint shelfPoint = iSchBasePointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getVehicle_code, whereJson.getString("shelfCode")));
|
||||
if (shelfPoint != null) {
|
||||
throw new BadRequestException("当前货架:" + whereJson.getString("shelfCode") + "已绑定在站点:" + shelfPoint.getPoint_code() + ",请先输入地面站点号:" + shelfPoint.getPoint_code() + ",进行解绑,再绑定。");
|
||||
}
|
||||
wrapper.set(SchBasePoint::getVehicle_code, whereJson.getString("shelfCode"))
|
||||
.set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("有货"))
|
||||
.eq(SchBasePoint::getPoint_code, whereJson.getString("siteCode"));
|
||||
} else {
|
||||
if (StringUtils.isNotBlank(sitePoint.getParent_point_code())) {
|
||||
if (!"0".equals(sitePoint.getParent_point_code())) {
|
||||
List<SchBasePoint> sitePointList = iSchBasePointService.list(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getParent_point_code, sitePoint.getParent_point_code()).eq(SchBasePoint::getIs_used, true));
|
||||
wrapper.in(SchBasePoint::getPoint_code, sitePointList);
|
||||
} else {
|
||||
@@ -515,6 +504,9 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
throw new BadRequestException("未找到载具所在的点位信息,请检查");
|
||||
}
|
||||
GroupPlate groupPlate = mdPbGroupplateMapper.selectById(whereJson.getString("group_id"));
|
||||
if (ObjectUtil.isEmpty(groupPlate)) {
|
||||
throw new BadRequestException("未找到该载具的组盘信息,请检查");
|
||||
}
|
||||
if (groupPlate.getFrozen_qty().compareTo(BigDecimal.ZERO) == 0 || groupPlate.getQty().compareTo(BigDecimal.ZERO) == 0) {
|
||||
throw new BadRequestException("该载具已出库确认,无需再次操作!");
|
||||
}
|
||||
@@ -567,12 +559,13 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
|
||||
pointCode = pointList.get(0).getPoint_code();
|
||||
}
|
||||
//确定起点
|
||||
SchBasePoint schBasePoint = iSchBasePointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getVehicle_code, whereJson.getString("vehicle_code")));
|
||||
SchBasePoint schBasePoint = iSchBasePointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getVehicle_code, whereJson.getString("storagevehicle_code")));
|
||||
if (ObjectUtil.isEmpty(schBasePoint)) {
|
||||
throw new BadRequestException("未找到载具所在的点位信息,请检查");
|
||||
}
|
||||
// 生成转运任务
|
||||
JSONObject task = new JSONObject();
|
||||
task.put("task_type", IOSConstant.PDA_POINT_TASK);
|
||||
task.put("config_code", IOSConstant.PDA_POINT_TASK);
|
||||
task.put("point_code1", schBasePoint.getPoint_code());
|
||||
task.put("point_code2", pointCode);
|
||||
|
||||
@@ -90,16 +90,16 @@ public class AutoTask {
|
||||
List<String> taskDtoList = new ArrayList<>();
|
||||
taskDtoList.add(updateIvtUtils.sendRcsParam(taskDao));
|
||||
RcsResponse resultForRcs = RcsResponse.requestOkMessage("", "");
|
||||
resultForRcs.setResponseDate(DateUtil.now());
|
||||
try {
|
||||
// 创建下发对象
|
||||
resultForRcs = iGateWayService.renotifyRcs(taskDtoList);
|
||||
} catch (Exception e) {
|
||||
log.error("任务下发异常: {}", e.getMessage());
|
||||
resultForRcs.setResponseDate(DateUtil.now());
|
||||
resultForRcs.setCode(HttpStatus.HTTP_BAD_REQUEST);
|
||||
resultForRcs.setDesc(e.getMessage());
|
||||
}
|
||||
if (resultForRcs.getCode() == HttpStatus.HTTP_OK) {
|
||||
if (resultForRcs.getCode() == 1000) {
|
||||
issuedTaskSet.add(taskDao.getTask_id());
|
||||
log.info("任务号{},载具号{}下发任务成功", taskDao.getTask_code(), taskDao.getVehicle_code());
|
||||
} else {
|
||||
|
||||
@@ -56,8 +56,8 @@ public class StInTask extends AbstractTask {
|
||||
task.setTask_code(json.getString("TaskCode"));
|
||||
task.setTask_status(TaskStatus.CREATE.getCode());
|
||||
task.setConfig_code(json.getString("task_type"));
|
||||
task.setPoint_code1(json.getString("PickingLocation"));
|
||||
task.setPoint_code2(json.getString("PlacedLocation"));
|
||||
task.setPoint_code1(json.getString("point_code1"));
|
||||
task.setPoint_code2(json.getString("point_code2"));
|
||||
task.setVehicle_type(json.getString("vehicle_type"));
|
||||
task.setVehicle_code(json.getString("vehicle_code"));
|
||||
task.setGroup_id(json.getString("group_id"));
|
||||
|
||||
@@ -55,8 +55,8 @@ public class StOutTask extends AbstractTask {
|
||||
task.setTask_code(json.getString("TaskCode"));
|
||||
task.setTask_status(TaskStatus.CREATE.getCode());
|
||||
task.setConfig_code(json.getString("task_type"));
|
||||
task.setPoint_code1(json.getString("PickingLocation"));
|
||||
task.setPoint_code2(json.getString("PlacedLocation"));
|
||||
task.setPoint_code1(json.getString("point_code1"));
|
||||
task.setPoint_code2(json.getString("point_code2"));
|
||||
task.setVehicle_code(json.getString("vehicle_code"));
|
||||
task.setVehicle_type(json.getString("vehicle_type"));
|
||||
task.setGroup_id(json.getString("group_id"));
|
||||
|
||||
@@ -55,7 +55,7 @@ public class VehicleOutTask extends AbstractTask {
|
||||
task.setTask_code(json.getString("TaskCode"));
|
||||
task.setTask_status(TaskStatus.CREATE.getCode());
|
||||
task.setConfig_code(json.getString("task_type"));
|
||||
task.setPoint_code1(json.getString("PickingLocation"));
|
||||
task.setPoint_code1(json.getString("point_code1"));
|
||||
task.setPoint_code2(json.getString("PlacedLocation"));
|
||||
task.setVehicle_code(json.getString("vehicle_code"));
|
||||
task.setVehicle_type(json.getString("vehicle_type"));
|
||||
|
||||
@@ -1008,8 +1008,8 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
|
||||
JSONObject task_form = new JSONObject();
|
||||
task_form.put("task_type", "STOutTask");
|
||||
task_form.put("TaskCode", CodeUtil.getNewCode("TASK_CODE"));
|
||||
task_form.put("PickingLocation", ioStorInvDis.getStruct_code());
|
||||
task_form.put("PlacedLocation", pointCode);
|
||||
task_form.put("point_code1", ioStorInvDis.getStruct_code());
|
||||
task_form.put("point_code2", pointCode);
|
||||
task_form.put("vehicle_code", ioStorInvDis.getStoragevehicle_code());
|
||||
StOutTask stOutTask = SpringContextHolder.getBean("STOutTask");
|
||||
String task_id = stOutTask.create(task_form);
|
||||
|
||||
@@ -528,8 +528,8 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
|
||||
JSONObject task_form = new JSONObject();
|
||||
task_form.put("task_type", "STInTask");
|
||||
task_form.put("TaskCode", CodeUtil.getNewCode("TASK_CODE"));
|
||||
task_form.put("PickingLocation", point_code);
|
||||
task_form.put("PlacedLocation", ioStorInvDis.getStruct_code());
|
||||
task_form.put("point_code1", point_code);
|
||||
task_form.put("point_code2", ioStorInvDis.getStruct_code());
|
||||
task_form.put("vehicle_code", map.get("storagevehicle_code"));
|
||||
// GroupPlate groupPlate = mdPbGroupplateMapper.selectOne(new LambdaQueryWrapper<>(GroupPlate.class)
|
||||
// .eq(GroupPlate::getStoragevehicle_code,map.get("storagevehicle_code"))
|
||||
|
||||
@@ -125,6 +125,9 @@ public class UpdateIvtUtils {
|
||||
* @param where 输入参数
|
||||
*/
|
||||
public void checkTask(JSONObject where) {
|
||||
if (StringUtils.isBlank(where.getString("point_code1")) || StringUtils.isBlank(where.getString("point_code2")) || StringUtils.isBlank(where.getString("vehicle_code"))) {
|
||||
throw new BadRequestException("起点或终点或载具编码不能为空!");
|
||||
}
|
||||
List<SchBaseTask> list;
|
||||
Set<String> pointIds = new HashSet<>();
|
||||
pointIds.add(where.getString("point_code1"));
|
||||
@@ -357,7 +360,7 @@ public class UpdateIvtUtils {
|
||||
acsTaskDto.setFromSystem("WMS");
|
||||
acsTaskDto.setPriority(taskDao.getPriority());
|
||||
TaskOrderDetail detail = new TaskOrderDetail();
|
||||
detail.setTaskPath(taskDao.getPoint_code2() + "," + taskDao.getPoint_code1());
|
||||
detail.setTaskPath(taskDao.getPoint_code1() + "," + taskDao.getPoint_code2());
|
||||
detail.setShelfNumber(taskDao.getVehicle_code());
|
||||
// Map<String, String> extraInfo = new HashMap<>();
|
||||
// extraInfo.put("s", "1");
|
||||
|
||||
@@ -129,38 +129,47 @@
|
||||
<logger name="jdbc" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.nl.wms.system_manage.service.quartz.task" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.springframework" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.hibernate" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.quartz" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="com.google" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.redisson" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.nl.modules.wql" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
<logger name="org.springframework.data" level="ERROR" additivity="true">
|
||||
<appender-ref ref="asyncFileAppender"/>
|
||||
<appender-ref ref="asyncLuceneAppender"/>
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
</logger>
|
||||
</springProfile>
|
||||
<!--测试环境:打印控制台-->
|
||||
|
||||
Reference in New Issue
Block a user