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

提交

Browse Source
This commit is contained in:
18188916393
2022-07-14 12:39:12 +08:00
parent 96c7e11285
commit c8168593dc
16 changed files with 178 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/WorkProcedureEnum.java
View File

@@ -11,7 +11,8 @@ public enum WorkProcedureEnum {
HNGX(1, "1514444198529601536", "01", "混碾工序", ""),
YZGX(2, "1514444247439380480", "02", "压制工序", ""),
SZGX(3, "1514444321896665088", "03", "烧制工序", ""),
FJGX(4, "1514444386174373888", "04", "分拣工序", "");
FJGX(4, "1514444386174373888", "04", "分拣工序", ""),
BZGX(5, "1544608256054398976", "05", "包装工序", "");
//顺序号
private int index;
//工序标识

7
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -44,6 +44,13 @@ public class AcsToWmsController {
acsToWmsService.manipulatorApply(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/group")
@Log("ACS扫码器组盘")
@ApiOperation("ACS扫码器组盘")
public ResponseEntity<Object> group(@RequestBody Map whereJson) {
acsToWmsService.group(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/ispackage")

11
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
View File

@@ -22,6 +22,17 @@ public interface AcsToWmsService {
*/
void manipulatorApply(Map jsonObject);
/**
* ACS客户端--->WMS服务端
* ACS机械手给WMS发送任务
*
* @param jsonObject 条件
* @return Map<String, Object>
*/
void group(Map jsonObject);
/**
* ACS给WMS请求是否优先包装
*

50
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.start.day01.Struct;
import org.nl.utils.SecurityUtils;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.database.service.dto.VehicleDto;
@@ -53,13 +54,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
case "1":
jsonObject.put("start_point_code", device_code);
jsonObject.put("create_mode", "01");
produceInfoByCode = this.getProduceInfoByCode(device_code);
String material_id = (String) jsonObject.get("material_id");
String pcsn = (String) jsonObject.get("pcsn");
if (StrUtil.isEmpty(material_id)) {
throw new BadRequestException("物料不能为空！");
}
if (StrUtil.isEmpty(pcsn)) {
throw new BadRequestException("批次不能为空！");
}
//批次 物料，客户要从排产单里面去取
jsonObject.put("pcsn", "pcsn");
//如果是出窑输送线 要从组盘表里面去找物料
if (StrUtil.equals(device_code, "CYSSX101")) {
String vehicle_code = (String) jsonObject.get("vehicle_code");
if (StrUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("载具不能为空！");
}
JSONObject vehicleObj = WQLObject.getWQLObject("st_buss_vehiclegroup").query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(vehicleObj)) {
throw new BadRequestException("为找到载具号为'" + vehicle_code + "'的组盘信息！");
}
material_id = vehicleObj.getString("material_id");
pcsn = vehicleObj.getString("pcsn");
}
jsonObject.put("pcsn", pcsn);
jsonObject.put("create_mode", "01");
jsonObject.put("material_id", produceInfoByCode.getString("material_id"));
jsonObject.put("cust_id", produceInfoByCode.getString("cust_id"));
jsonObject.put("stewing_time", produceInfoByCode.getString("stewing_time"));
jsonObject.put("material_id", material_id);
JSONObject materiralObj = WQLObject.getWQLObject("md_me_material").query("material_id = '" + material_id + "'").uniqueResult(0);
String stewing_time = materiralObj.getString("stewing_time");
jsonObject.put("stewing_time", stewing_time);
jsonObject.put("producetask_id", produceInfoByCode.getString("producetask_id"));
sendMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject));
break;
@@ -107,7 +130,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
StrUtil.equals(device_code, "FJJXS02MD2")
) {
produceInfoByCode = this.getProduceInfoByCode(device_code);
String material_id = produceInfoByCode.getString("material_id");
material_id = produceInfoByCode.getString("material_id");
String cust_id = produceInfoByCode.getString("cust_id");
String workprocedure_id = WorkProcedureEnum.YZGX.getId();
JSONObject jsonObject1 = WQL.getWO("ACSTOMES_001").addParam("flag", "1")
@@ -223,6 +246,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
this.receiveTaskFromAcs(jsonObject);
}
@Override
public void group(Map jsonObject) {
String task_id = (String) jsonObject.get("task_id");
String vehicle_code = (String) jsonObject.get("vehicle_code");
if (StrUtil.isEmpty(task_id)) {
throw new BadRequestException("任务标识不能为空！");
}
if (StrUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("载具号不能为空！");
}
//1组盘
WQLObject.getWQLObject("")
//2 生成任务
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> ispackage(Map jsonObject) {

21
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AreaEnum.java
View File

@@ -6,16 +6,19 @@ package org.nl.wms.sch.manage;
* 24 窑区域 25 空钢托堆叠区 26 自动柴垛线
*/
public enum AreaEnum {
KLHJ("01", "困料货架"),
CYHJ("02", "出窑货架()"),
CYZC("03", "出窑暂存区"),
BZZC("04", "包装暂存区"),
HNQY("21", "混碾区域"),
RYHCHJ("01", "入窑缓存库"),
CYHCHJ("02", "出窑缓存货架"),
DKKTTPQ("03", "单口空铁托盘区"),
DDKTTPQ("04", "堆叠空铁托盘区"),
MTPQ("05", "木托盘区"),
BTHCQ("06", "半托缓存库区"),
RYSSXQ("07", "入窑输送线区"),
CYZDSSXQ("08", "出窑自动输送线区"),
CYRGSSXQ("09", "出窑人工输送线区"),
YZQY("22", "压制区域"),
YYJLZ("23", "液压机料盅架"),
YQU("24", "窑区域"),
KGTDDQ("25", "空钢托堆叠区"),
ZDCDX("26", "自动柴垛线");
YQY("24", "窑区域"),
FJQY("27", "分拣区域"),
BZQY("28", "包装区");
private final String name;
private final String code;

44
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java
View File

@@ -110,25 +110,19 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
String start_area = "";
String vehicle_type = "";
switch (workProcedureEnum) {
//混黏工序
case HNGX:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
// 压制工序
// 压制工序
case YZGX:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
//烧制工序
case SZGX:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
vehicle_type = VehicleTypeEnum.GTP.getCode();
start_area = AreaEnum.DDKTTPQ.getCode();
//分拣工序
case FJGX:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
vehicle_type = VehicleTypeEnum.MTP.getCode();
start_area = AreaEnum.MTPQ.getCode();
default:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
start_area = AreaEnum.DDKTTPQ.getCode();
}
//寻找一个合适的仓位
JSONObject outStructObj = StructFindUtil.getEmptyVehicleOutStruct(param);
@@ -192,33 +186,21 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
String device_id = workInfo.getString("device_id");
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
//混黏工序
case HNGX:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
break;
// 压制工序
case YZGX:
vehicle_type = VehicleTypeEnum.GTP.getCode();
start_area = AreaEnum.CYHJ.getCode();
break;
//烧制工序
case SZGX:
vehicle_type = VehicleTypeEnum.GTP.getCode();
start_area = AreaEnum.CYZC.getCode();
break;
start_area = AreaEnum.DDKTTPQ.getCode();
//分拣工序
case FJGX:
//托盘类型取当前工单生产的托盘类型
//托盘类型取的物料对应的木托盘类型
JSONObject produceObj = WQLObject.getWQLObject("PDM_MG_produceTask").query("device_id='" + device_id + "' and producetask_status='04'").uniqueResult(0);
vehicle_type = produceObj.getString("vehicle_type");
start_area = AreaEnum.CYZC.getCode();
start_area = AreaEnum.MTPQ.getCode();
is_auto_issue = "0";
break;
default:
vehicle_type = VehicleTypeEnum.LZ.getCode();
start_area = AreaEnum.KLHJ.getCode();
vehicle_type = VehicleTypeEnum.GTP.getCode();
start_area = AreaEnum.DDKTTPQ.getCode();
}
JSONObject param = new JSONObject();
param.put("vehicle_type", vehicle_type);

31
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -179,9 +179,6 @@ public class CallMaterialTask extends AbstractAcsTask {
if (StrUtil.isEmpty(material_id)) {
throw new BadRequestException("物料标识不能为空！");
}
if (StrUtil.isEmpty(cust_id)) {
throw new BadRequestException("客户不能为空！");
}
if (StrUtil.isEmpty(create_mode)) {
throw new BadRequestException("创建方式不能为空！");
}
@@ -232,26 +229,16 @@ public class CallMaterialTask extends AbstractAcsTask {
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
//混黏工序
case HNGX:
startArea_type = AreaEnum.KLHJ.getCode();
bill_type = BillTypeEnum.HNCK.getCode();
break;
// 压制工序
case YZGX:
startArea_type = AreaEnum.KLHJ.getCode();
bill_type = BillTypeEnum.YZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.HNGX.getId();
break;
//烧制工序
case SZGX:
startArea_type = AreaEnum.CYHJ.getCode();
startArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.SZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
break;
//分拣工序
case FJGX:
startArea_type = AreaEnum.CYZC.getCode();
startArea_type = AreaEnum.CYHCHJ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
@@ -260,17 +247,17 @@ public class CallMaterialTask extends AbstractAcsTask {
// （机械手呼叫空托盘，需要呼叫半满托盘）如果请求有工序，假如是压制工序，则库存工序是压制，起点是出窑货架
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
// 压制工序
case YZGX:
startArea_type = AreaEnum.CYHJ.getCode();
bill_type = BillTypeEnum.YZCK.getCode();
//烧制工序
case SZGX:
startArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.SZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
break;
//分拣工序
case FJGX:
startArea_type = AreaEnum.BZZC.getCode();
startArea_type = AreaEnum.CYHCHJ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
}
}

18
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java
View File

@@ -171,24 +171,14 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
String workprocedure_id = workInfo.getString("workprocedure_id");
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
//混黏工序
case HNGX:
next_area = AreaEnum.KLHJ.getCode();
break;
// 压制工序
case YZGX:
next_area = AreaEnum.CYHJ.getCode();
break;
//烧制工序
case SZGX:
next_area = AreaEnum.CYZC.getCode();
break;
//分拣工序
case FJGX:
next_area = AreaEnum.KGTDDQ.getCode();
next_area = AreaEnum.DDKTTPQ.getCode();
break;
default:
next_area = AreaEnum.KLHJ.getCode();
next_area = AreaEnum.DDKTTPQ.getCode();
}
JSONObject param = new JSONObject();
param.put("area_type", next_area);

13
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
View File

@@ -238,29 +238,24 @@ public class SendMaterialTask extends AbstractAcsTask {
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
//混黏工序
case HNGX:
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
endArea_type = AreaEnum.KLHJ.getCode();
bill_type = BillTypeEnum.HNRK.getCode();
break;
// 压制工序
case YZGX:
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
endArea_type = AreaEnum.CYHJ.getCode();
endArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.YZRK.getCode();
break;
//烧制工序
case SZGX:
qty_unit_id = BussConstant.YZ_IN_QTY_UNIT_ID;
bill_type = BillTypeEnum.SZRK.getCode();
endArea_type = AreaEnum.CYZC.getCode();
endArea_type = AreaEnum.CYHCHJ.getCode();
break;
//分拣工序
case FJGX:
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
bill_type = BillTypeEnum.SZRK.getCode();
endArea_type = AreaEnum.BZZC.getCode();
endArea_type = AreaEnum.MTPQ.getCode();
break;
default:
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql
View File

@@ -108,7 +108,7 @@
left join st_rule_IOdisStruct ruledis on ruledis.struct_uuid = structattr.struct_id
WHERE
point.lock_type = '00'
AND point.vehicle_code = ''
AND (point.vehicle_code = '' or point.vehicle_code is null)
AND point.point_status = '00'
AND rule.material_id = 输入.material_id
AND point.area_type = 输入.area_type

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/dto/WorkprocedureiosDto.java
View File

@@ -113,4 +113,7 @@ public class WorkprocedureiosDto implements Serializable {
/** 黏次 */
private String mix_seq;
/** 静置时间 */
private String stewing_time;
}

26
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java
View File

@@ -117,6 +117,10 @@ public class WorkprocedureiosServiceImpl implements WorkprocedureiosService {
qty_unit_id = Long.valueOf(unit_id);
dto.setQty_unit_id(qty_unit_id);
}
//根据物料获取 物料的静止时间
JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id='" + dto.getMaterial_id() + "'").uniqueResult(0);
String stewing_time = materialObj.getString("stewing_time");
dto.setStewing_time(stewing_time);
dto.setCreate_mode("01");
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
@@ -279,14 +283,24 @@ public class WorkprocedureiosServiceImpl implements WorkprocedureiosService {
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
// TODO
switch (workProcedureEnum) {
//混黏工序
case HNGX:
endArea = AreaEnum.KLHJ.getCode();
qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
break;
// 压制工序
case YZGX:
endArea = AreaEnum.CYHJ.getCode();
endArea = AreaEnum.RYHCHJ.getCode();
qty_unit_id = BussConstant.YZ_IN_QTY_UNIT_ID;
break;
// 烧制区域
case SZGX:
endArea = AreaEnum.CYHCHJ.getCode();
qty_unit_id = BussConstant.YZ_IN_QTY_UNIT_ID;
break;
// 分拣工序
case FJGX:
endArea = AreaEnum.BTHCQ.getCode();
qty_unit_id = BussConstant.YZ_IN_QTY_UNIT_ID;
break;
// 包装工序
case BZGX:
endArea = AreaEnum.BTHCQ.getCode();
qty_unit_id = BussConstant.YZ_IN_QTY_UNIT_ID;
break;
default:

64
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java
View File

@@ -100,17 +100,17 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
Map<String, Object> endMap = this.getEndAareaByworkprocedureId(dto.getWorkprocedure_id().toString());
String start_area = dto.getEnd_point_code();
if (StrUtil.isEmpty(start_area)){
if (StrUtil.isEmpty(start_area)) {
String startArea = MapUtil.getStr(endMap, "start_area");
if (StrUtil.isEmpty(startArea)){
if (StrUtil.isEmpty(startArea)) {
throw new BadRequestException("起始区域为空,枚举中未查到工序对应区域!");
}
dto.setStart_area(startArea);
}
Long qty_unit_id = dto.getQty_unit_id();
if (ObjectUtil.isNull(qty_unit_id)){
if (ObjectUtil.isNull(qty_unit_id)) {
String unit_id = MapUtil.getStr(endMap, "qty_unit_id");
if (StrUtil.isEmpty(unit_id)){
if (StrUtil.isEmpty(unit_id)) {
throw new BadRequestException("数量单位为空，枚举中未查到工序对应区域!");
}
qty_unit_id = Long.valueOf(unit_id);
@@ -143,17 +143,17 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
Map<String, Object> endMap = this.getEndAareaByworkprocedureId(dto.getWorkprocedure_id().toString());
String start_area = dto.getEnd_point_code();
if (StrUtil.isEmpty(start_area)){
if (StrUtil.isEmpty(start_area)) {
String startArea = MapUtil.getStr(endMap, "start_area");
if (StrUtil.isEmpty(startArea)){
if (StrUtil.isEmpty(startArea)) {
throw new BadRequestException("起始区域为空,枚举中未查到工序对应区域!");
}
dto.setStart_area(startArea);
}
Long qty_unit_id = dto.getQty_unit_id();
if (ObjectUtil.isNull(qty_unit_id)){
if (ObjectUtil.isNull(qty_unit_id)) {
String unit_id = MapUtil.getStr(endMap, "qty_unit_id");
if (StrUtil.isEmpty(unit_id)){
if (StrUtil.isEmpty(unit_id)) {
throw new BadRequestException("数量单位为空，枚举中未查到工序对应区域!");
}
qty_unit_id = Long.valueOf(unit_id);
@@ -250,16 +250,16 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
String is_full = jsonObject.getString("is_full");
String ivt_workprocedure_id = jsonObject.getString("ivt_workprocedure_id");
String create_mode = jsonObject.getString("create_mode");
form.put("start_point_code",start_point_code);
form.put("next_point_code",next_point_code);
form.put("vehicle_code",vehicle_code);
form.put("material_id",material_id);
form.put("cust_id",cust_id);
form.put("create_mode",create_mode);
form.put("pcsn",pcsn);
form.put("is_full",is_full);
form.put("ivt_workprocedure_id",ivt_workprocedure_id);
form.put("iostorinv_id",iostorinv_id);
form.put("start_point_code", start_point_code);
form.put("next_point_code", next_point_code);
form.put("vehicle_code", vehicle_code);
form.put("material_id", material_id);
form.put("cust_id", cust_id);
form.put("create_mode", create_mode);
form.put("pcsn", pcsn);
form.put("is_full", is_full);
form.put("ivt_workprocedure_id", ivt_workprocedure_id);
form.put("iostorinv_id", iostorinv_id);
CallMaterialTask callMaterialTask = new CallMaterialTask();
String task_id = callMaterialTask.createTask(form);
@@ -275,15 +275,15 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
}
@Override
public Map<String,Object> getStartPoint(Map whereJson, Pageable page) {
public Map<String, Object> getStartPoint(Map whereJson, Pageable page) {
String material_id = MapUtil.getStr(whereJson, "material_id");
String is_full = MapUtil.getStr(whereJson, "is_full");
String ivt_workprocedure_id = MapUtil.getStr(whereJson, "ivt_workprocedure_id");
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("material_id",material_id);
map.put("is_full",is_full);
map.put("ivt_workprocedure_id",ivt_workprocedure_id);
map.put("material_id", material_id);
map.put("is_full", is_full);
map.put("ivt_workprocedure_id", ivt_workprocedure_id);
JSONObject json = WQL.getWO("ST_WorkprocedureiosOut_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "structivt.pcsn desc");
return json;
}
@@ -295,24 +295,24 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
// TODO
switch (workProcedureEnum) {
//混黏工序
case HNGX:
startArea = AreaEnum.KLHJ.getCode();
qty_unit_id = null;
break;
// 压制工序
case YZGX:
startArea = AreaEnum.YZQY.getCode();
case SZGX:
startArea = AreaEnum.RYHCHJ.getCode();
qty_unit_id = BussConstant.YZ_OUT_QTY_UNIT_ID;
break;
// 分拣工序
case FJGX:
startArea = AreaEnum.CYHCHJ.getCode();
qty_unit_id = BussConstant.YZ_IN_QTY_UNIT_ID;
break;
default:
startArea = null;
qty_unit_id = null;
break;
}
JSONObject map = new JSONObject();
map.put("start_area",startArea);
map.put("qty_unit_id",qty_unit_id);
map.put("start_area", startArea);
map.put("qty_unit_id", qty_unit_id);
return map;
}
@@ -342,7 +342,7 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
break;
}
JSONObject map = new JSONObject();
map.put("ivt_workprocedure_id",ivt_workprocedure_id);
map.put("ivt_workprocedure_id", ivt_workprocedure_id);
return map;
}

BIN
wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.

20
wms/qd/src/views/wms/st/in/index.vue
View File

@@ -187,6 +187,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="false" label="静置时间">
<label slot="label">静置时间</label>
<el-input v-model="form.stewing_time" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
@@ -357,6 +363,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="false" label="静置时间">
<label slot="label">静置时间</label>
<el-input v-model="form.stewing_time" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
@@ -405,7 +417,7 @@
<el-table-column prop="material_name" label="物料" width="200" />
<el-table-column prop="vehicle_code" label="载具编码" width="150" />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="mix_seq" label="黏次" />
<el-table-column prop="stewing_time" label="静置时间" />
<el-table-column prop="qty" label="数量" width="100">
<template slot-scope="scope">
{{ fun(scope.row.qty) }}
@@ -503,7 +515,7 @@ const defaultForm = {
pcsn: null,
ivt_workprocedure_id: null,
is_full: '1',
mix_seq: ''
stewing_time: null
}
export default {
name: 'Workprocedureios',
@@ -527,7 +539,7 @@ export default {
},
data() {
return {
form1: { iostorinv_id: null, bill_code: null, io_type: null, bill_type: null, workprocedure_id: null, material_id: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_area: null, end_area: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null, end_point_name: null, material_name: null, pcsn: null, ivt_workprocedure_id: null, is_full: null, mix_seq: '' },
form1: { iostorinv_id: null, bill_code: null, io_type: null, bill_type: null, workprocedure_id: null, material_id: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_area: null, end_area: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null, end_point_name: null, material_name: null, pcsn: null, ivt_workprocedure_id: null, is_full: null, stewing_time: null },
endPointDialog: false,
work_flag: true,
materDialog: false,
@@ -563,7 +575,7 @@ export default {
],
is_full: [
{ required: true, message: '是否满托不能为空', trigger: 'blur' }
]
],
},
queryTypeOptions: [
{ key: 'bill_code', display_name: '单据编号' }

30
wms/qd/src/views/wms/st/out/index.vue
View File

@@ -139,20 +139,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-select v-model="form.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
<el-option
v-for="item in custList"
:key="item.cust_id"
:label="item.cust_name"
:value="item.cust_id"
/>
</el-select>
</el-form-item>
<el-form-item label="黏次">
<label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
<el-input v-model="form.mix_seq" style="width: 200px;" />
</el-form-item>
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
<el-input v-model="form.remark" type="textarea" style="width: 530px;" />
@@ -284,20 +270,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-select v-model="form1.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
<el-option
v-for="item in custList"
:key="item.cust_id"
:label="item.cust_name"
:value="item.cust_id"
/>
</el-select>
</el-form-item>
<el-form-item label="黏次">
<label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
<el-input v-model="form1.mix_seq" style="width: 200px;" />
</el-form-item>
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
<el-input v-model="form1.remark" type="textarea" style="width: 530px;" />
@@ -341,7 +313,6 @@
<el-table-column prop="material_name" label="物料" width="90" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="mix_seq" label="黏次" />
<el-table-column prop="qty" label="数量" width="100">
<template slot-scope="scope">
{{ fun(scope.row.qty) }}
@@ -360,7 +331,6 @@
{{ dict.label.sch_area_type[scope.row.end_area] }}
</template>
</el-table-column>
<el-table-column prop="cust_name" label="客户" />
<el-table-column prop="create_mode" label="生成方式">
<template slot-scope="scope">
{{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}