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-10-19 16:47:10 +08:00
parent 92d72e9caf
commit 31a9215a97
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,6 +167,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
material_jo.put("print_model", materialjo.getString("PRINTTYPE"));
material_jo.put("is_auto_package", materialjo.getString("ISAUTO"));
material_jo.put("material_type", materialjo.getString("TYPEID"));
material_jo.put("vehicle_type", materialjo.getString("VEHICLETYPE"));
material_jo.put("is_used", "1");
material_jo.put("update_optid", "1");
material_jo.put("update_optname", "管理员");

7
wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
View File

@@ -124,6 +124,12 @@ public class ProducetaskServiceImpl implements ProducetaskService {
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String material_id = dto.getMaterial_id().toString();
//根据物料去找木托盘类型
JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id = '" + material_id + "'").uniqueResult(0);
String vehicle_type = materialObj.getString("vehicle_type");
dto.setVehicle_type(vehicle_type);
dto.setProducetask_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setProducetask_code(CodeUtil.getNewCode("PRODUCE_CODE"));
dto.setCreate_id(currentUserId);
@@ -133,7 +139,6 @@ public class ProducetaskServiceImpl implements ProducetaskService {
dto.setUpdate_time(now);
dto.setCreate_time(now);
dto.setProducetask_status("01");
WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
View File

@@ -84,7 +84,7 @@
point.point_name like "%" 输入.struct_name "%")
ENDOPTION
OPTION 输入.storagevehicle_code <> ""
ivt.vehicle_code like "%"输入.storagevehicle_code"%"
ivt.vehicle_code like "%" 输入.storagevehicle_code "%"
ENDOPTION
OPTION 输入.sect_uuid <> ""
struct.sect_id = 输入.sect_uuid

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

Binary file not shown.

2
wms/qd/src/views/wms/pdm/produceTask/index.vue
View File

@@ -219,7 +219,7 @@
<el-date-picker v-model="form.plan_date" clearable value-format="yyyy-MM-dd " format="yyyy-MM-dd" type="date" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具类型">
<el-form-item v-if="false" label="载具类型">
<el-select
v-model="form.vehicle_type"
style="width: 200px"