From 5939a0e520cd1f0e1580f6092933e22b4b8f96b3 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Tue, 28 May 2024 09:26:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=87=BA=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoLashTask.java | 1 + .../util/impl/InBussManageServiceImpl.java | 85 +++++++++++------- .../util/impl/LashManageServiceImpl.java | 6 +- .../util/impl/SendOutManageServiceImpl.java | 10 +-- .../rest/StoragevehicleinfoController.java | 4 +- .../service/StoragevehicleinfoService.java | 2 +- .../impl/StoragevehicleinfoServiceImpl.java | 43 ++++++--- .../master/wql/QMD_PB_STORAGEVEHICLEINFO.wql | 4 + .../org/nl/wms/basedata/master/wql/mdpb.xls | Bin 164864 -> 164864 bytes .../master/storagevehicleinfo/index.vue | 27 +++--- 10 files changed, 115 insertions(+), 67 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index 45ba4fedd..932931144 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -87,6 +87,7 @@ public class TwoLashTask extends AbstractAcsTask { interaction_json.put("height",dao.get(0).getBox_high()); interaction_json.put("template","2"); interaction_json.put("bindingTimes","1"); + interaction_json.put("isBinding", IOSEnum.IS_SEND.code("是")); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); AcsTaskDto dto = AcsTaskDto.builder() diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index 59b0ed013..b3d314220 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -7,8 +7,11 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.checkerframework.checker.units.qual.A; 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.database.service.IBstIvtBoxinfoService; +import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService; @@ -53,6 +56,9 @@ public class InBussManageServiceImpl implements InBussManageService { @Autowired private IschBaseTaskService ischBaseTaskService; + @Autowired + private IBstIvtBoxinfoService iBstIvtBoxinfoService; + /** * 不需要查询的排集合 */ @@ -77,7 +83,7 @@ public class InBussManageServiceImpl implements InBussManageService { String operate = json.getString("operate"); if (operate.equals(IOSEnum.IO_TYPE.code("入库"))) { - attrTab.update(json, "struct_code IN ('"+ String.join("','", param) +"')"); + attrTab.update(json, "struct_code IN ('" + String.join("','", param) + "')"); } } @@ -110,10 +116,10 @@ public class InBussManageServiceImpl implements InBussManageService { */ JSONArray attrArry = attrTab.query("IFNULL(storagevehicle_code,'') = '' " + "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + - "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '"+jsonObject.getString("stor_id")+"' " + + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonObject.getString("stor_id") + "' " + "AND storagevehicle_type = '" + jsonObject.getString("vehicle_type") + "'" + "AND height = '" + jsonObject.getString("height") + "'" + - "AND sect_id = '"+jsonObject.getString("sect_id")+"'").getResultJSONArray(0); + "AND sect_id = '" + jsonObject.getString("sect_id") + "'").getResultJSONArray(0); if (ObjectUtil.isEmpty(attrArry)) { notInRowList.clear(); @@ -136,13 +142,13 @@ public class InBussManageServiceImpl implements InBussManageService { /* * 确定哪排：查看每排相同木箱规格等 的数量，找到数量最小的那排 */ - jsonSub.put("block_num",block_num); + jsonSub.put("block_num", block_num); String row_num = getMinRow(jsonSub); /* * 确定伸位，找仓位 */ - jsonSub.put("row_num",row_num); + jsonSub.put("row_num", row_num); JSONObject jsonAttr = queryStruct(jsonSub); // 为空则新找巷道 @@ -169,7 +175,7 @@ public class InBussManageServiceImpl implements InBussManageService { json.put("box_high", jsonSub.getString("box_high")); String row_num_2 = getMinRow(json); - json.put("row_num",row_num_2); + json.put("row_num", row_num_2); JSONObject jsonAttr_2 = queryStruct(json); if (ObjectUtil.isNotEmpty(jsonAttr_2)) { @@ -204,10 +210,16 @@ public class InBussManageServiceImpl implements InBussManageService { throw new BadRequestException("设备号不能为空!"); } + // 查询木箱信息 + BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( + new QueryWrapper().lambda() + .eq(BstIvtBoxinfo::getBox_no, jsonObject.getString("box_no")) + ); + List pcsnList = Arrays.asList(material_barcode.split(",")); // 查询子卷包装关系 - List subList = subTab.query("container_name in ('"+String.join("','", pcsnList)+"') and status = '0'") + List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status = '0'") .getResultJSONArray(0).toJavaList(JSONObject.class); if (ObjectUtil.isEmpty(subList)) { @@ -248,7 +260,7 @@ public class InBussManageServiceImpl implements InBussManageService { jsonDtl.put("is_active", IOSEnum.IS_SEND.code("是")); tableData.add(jsonDtl); } - mst.put("tableData",tableData); + mst.put("tableData", tableData); // 调用服务创建 String iostorinv_id = iStIvtIostorinvService.insertMst(mst); @@ -262,20 +274,21 @@ public class InBussManageServiceImpl implements InBussManageService { ).get(0); List disList = iStIvtIostorinvdisService.list( - new QueryWrapper().lambda() - .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) - ).stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row), LinkedHashMap.class)) + new QueryWrapper().lambda() + .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) + ).stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row), LinkedHashMap.class)) .collect(Collectors.toList()); - jsonDiv.put("dtl_row",JSONObject.parseObject(JSON.toJSONString(dtlDao))); + jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao))); jsonDiv.put("tableMater", disList); jsonDiv.put("checked", true); jsonDiv.put("is_send", IOSEnum.IS_SEND.code("是")); jsonDiv.put("point_code", jsonObject.getString("device_code")); jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区")); jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期")); - jsonDiv.put("material_barcode",jsonObject.getString("material_barcode")); - jsonDiv.put("vehicle_code",jsonObject.getString("vehicle_code")); + jsonDiv.put("material_barcode", jsonObject.getString("material_barcode")); + jsonDiv.put("vehicle_code", jsonObject.getString("vehicle_code")); + jsonDiv.put("vehicle_type", boxDao.getVehicle_type()); iStIvtIostorinvService.divStruct(jsonDiv); } @@ -298,9 +311,9 @@ public class InBussManageServiceImpl implements InBussManageService { // 查找对应单据 List disDaoList = iStIvtIostorinvdisService.list( - new QueryWrapper().lambda() - .eq(StIvtIostorinvdis::getTask_id, taskDao.getTask_id()) - ).stream() + new QueryWrapper().lambda() + .eq(StIvtIostorinvdis::getTask_id, taskDao.getTask_id()) + ).stream() .map(row -> JSONObject.parseObject(JSON.toJSONString(row), LinkedHashMap.class)) .collect(Collectors.toList()); @@ -319,9 +332,9 @@ public class InBussManageServiceImpl implements InBussManageService { // 重新分配过的明细 List disList = iStIvtIostorinvdisService.list( - new QueryWrapper().lambda() - .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) - ).stream() + new QueryWrapper().lambda() + .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) + ).stream() .map(row -> JSONObject.parseObject(JSON.toJSONString(row), LinkedHashMap.class)) .collect(Collectors.toList()); @@ -331,7 +344,7 @@ public class InBussManageServiceImpl implements InBussManageService { ).get(0); JSONObject jsonDiv = new JSONObject(); - jsonDiv.put("dtl_row",JSONObject.parseObject(JSON.toJSONString(dtlDao))); + jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao))); jsonDiv.put("tableMater", disList); jsonDiv.put("checked", true); jsonDiv.put("is_send", IOSEnum.IS_SEND.code("否")); @@ -343,8 +356,8 @@ public class InBussManageServiceImpl implements InBussManageService { // 3.更新明细任务标识 iStIvtIostorinvdisService.update( new UpdateWrapper().lambda() - .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) - .set(StIvtIostorinvdis::getTask_id, taskDao.getTask_id()) + .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) + .set(StIvtIostorinvdis::getTask_id, taskDao.getTask_id()) ); // 4.更新任务终点 @@ -361,12 +374,13 @@ public class InBussManageServiceImpl implements InBussManageService { /** * 获取最小巷道 + * * @param jsonSub { * jsonSub：木箱信息 * sect_id：库区 * stor_id：仓库 * material_id：物料 - * } + * } * @return String ： 巷道 */ private String getMinBlock(JSONObject jsonSub) { @@ -384,7 +398,7 @@ public class InBussManageServiceImpl implements InBussManageService { .collect(Collectors.joining("','")); jsonSub.put("flag", "2"); - jsonSub.put("block_in", "('"+block_in+"')"); + jsonSub.put("block_in", "('" + block_in + "')"); List boxAllList = WQL.getWO("BST_INRULE").addParamMap(jsonSub) .process().getResultJSONArray(0).toJavaList(JSONObject.class); @@ -410,7 +424,7 @@ public class InBussManageServiceImpl implements InBussManageService { } // 区分木箱规格：最小木箱的巷道 - JSONObject jsonBlockLikeMin = sumBlockMinNum(blockList,boxAllLikeList); + JSONObject jsonBlockLikeMin = sumBlockMinNum(blockList, boxAllLikeList); /* * 比较两个巷道的总木箱数，取最小的 @@ -426,7 +440,8 @@ public class InBussManageServiceImpl implements InBussManageService { /** * 计算最小巷道木箱数 - * @param blockList : 所有巷道 + * + * @param blockList : 所有巷道 * @param boxAllList: 所有木箱 * @return JSONObject：最小木箱数的巷道 JSONObject{block_num，box_num} */ @@ -456,6 +471,7 @@ public class InBussManageServiceImpl implements InBussManageService { /** * 获取最小排 + * * @param jsonSub { * jsonSub：木箱信息 * sect_id：库区 @@ -463,7 +479,7 @@ public class InBussManageServiceImpl implements InBussManageService { * material_id：物料 * block_num： 巷道 * not_row_in: 排（用于递归查询） - * } + * } * @return String ： 排 */ private String getMinRow(JSONObject jsonSub) { @@ -482,7 +498,7 @@ public class InBussManageServiceImpl implements InBussManageService { .collect(Collectors.joining("','")); jsonSub.put("flag", "2"); - jsonSub.put("row_in", "('"+row_in+"')"); + jsonSub.put("row_in", "('" + row_in + "')"); List boxAllList = WQL.getWO("BST_INRULE").addParamMap(jsonSub) .process().getResultJSONArray(0).toJavaList(JSONObject.class); @@ -527,7 +543,8 @@ public class InBussManageServiceImpl implements InBussManageService { /** * 计算最小木箱的排 - * @param rowList : 所有排 + * + * @param rowList : 所有排 * @param boxAllList: 所有木箱 * @return JSONObject：最小木箱数的排 JSONObject{row_num，box_num} */ @@ -557,6 +574,7 @@ public class InBussManageServiceImpl implements InBussManageService { /** * 获取仓位 + * * @param jsonSub { * jsonSub：木箱信息 * sect_id：库区 @@ -564,7 +582,7 @@ public class InBussManageServiceImpl implements InBussManageService { * material_id：物料 * block_num： 巷道 * row_num ：排 - * } + * } * @return JSONObject ： 仓位 */ private JSONObject queryStruct(JSONObject jsonSub) { @@ -580,7 +598,7 @@ public class InBussManageServiceImpl implements InBussManageService { // 新的一排 String row_num_new = this.getMinRow(jsonSub); - jsonSub.put("row_num",row_num_new); + jsonSub.put("row_num", row_num_new); jsonAttr = this.getStruct(jsonSub); } @@ -590,6 +608,7 @@ public class InBussManageServiceImpl implements InBussManageService { /** * 获取一个货位公共方法 + * * @param jsonSub { * jsonSub：木箱信息 * sect_id：库区 @@ -597,7 +616,7 @@ public class InBussManageServiceImpl implements InBussManageService { * material_id：物料 * block_num： 巷道 * row_num ：排 - * } + * } * @return JSONObject ： 仓位 */ private JSONObject getStruct(JSONObject jsonSub) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index a0af0d868..b1b54b543 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -209,15 +209,15 @@ public class LashManageServiceImpl implements LashManageService { result.put("width", boxDao.getBox_width()); result.put("height", boxDao.getBox_high()); result.put("case", boxDao.getMaterial_code()); - result.put("isBinding", IOSEnum.IS_SEND.code("否")); + result.put("isBinding", IOSEnum.IS_SEND.code("是")); result.put("isLabeling", IOSEnum.IS_SEND.code("否")); result.put("labelingTemplate", boxDao.getLash_num()); - result.put("bindingTemplate", "1"); + result.put("bindingTemplate", boxDao.getLash_num()); result.put("printDevice", "1"); result.put("printQty", "1"); - result.put("bundleTimes", "2"); + result.put("bundleTimes", "1"); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index 053e04f82..e7310c446 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -70,14 +70,8 @@ public class SendOutManageServiceImpl implements SendOutManageService { .eq(SchBasePoint::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) ); - // 根据载具号找到对应的木箱号 - JSONObject jsonExt = extTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonExt)) { - throw new BadRequestException("此载具上没有木箱，请检查!"+whereJson.getString("vehicle_code")); - } - // 1.查询此木箱号的子卷包装关系 - JSONObject jsonSub = subTab.query("package_box_sn = '" + jsonExt.getString("pcsn") + "'").uniqueResult(0); + JSONObject jsonSub = subTab.query("package_box_sn = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSub)) { throw new BadRequestException("未查询到该木箱对应的包装关系！"); } @@ -215,6 +209,6 @@ public class SendOutManageServiceImpl implements SendOutManageService { ); // 删除载具对应木箱记录 - extTab.delete(jsonExt); + //extTab.delete(jsonExt); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java index 6931be729..6275fe0b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java @@ -48,8 +48,8 @@ public class StoragevehicleinfoController { @Log("修改载具") //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") - public ResponseEntity update(@Validated @RequestBody StoragevehicleinfoDto dto) { - storagevehicleinfoService.update(dto); + public ResponseEntity update(@RequestBody JSONObject map) { + storagevehicleinfoService.update(map); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java index 09b005606..f1ebe11bc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java @@ -61,7 +61,7 @@ public interface StoragevehicleinfoService { * * @param dto / */ - void update(StoragevehicleinfoDto dto); + void update(JSONObject dto); /** * 多选删除 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index c15e827d0..2ea448b12 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -160,24 +160,47 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService @Override @Transactional(rollbackFor = Exception.class) - public void update(StoragevehicleinfoDto dto) { + public void update(JSONObject dto) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject jsonObject = wo.query("storagevehicle_code = '" + dto.getStoragevehicle_code() + "' and is_delete = '0'").uniqueResult(0); + WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); + JSONObject jsonObject = wo.query("storagevehicle_code = '" + dto.getString("storagevehicle_code") + "' and is_delete = '0' AND storagevehicle_id != '" + dto.getString("storagevehicle_id") + "'").uniqueResult(0); if (!ObjectUtil.isEmpty(jsonObject)) { throw new BadRequestException("此载具已存在"); } - StoragevehicleinfoDto entity = this.findById(dto.getStoragevehicle_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + String qty = dto.getString("qty"); + String pcsn = dto.getString("pcsn"); + if (StrUtil.isNotEmpty(qty) || StrUtil.isNotEmpty(pcsn)) { + JSONObject ext_jo = veExtTab.query("storagevehicle_code = '"+dto.getString("storagevehicle_code")+"'").uniqueResult(0); + if (ObjectUtil.isEmpty(ext_jo)) { + //新增一条记录 + JSONObject jsonVeExt = new JSONObject(); + jsonVeExt.put("storagevehicleext_id", org.nl.common.utils.IdUtil.getLongId()); + jsonVeExt.put("storagevehicle_id", dto.getLongValue("storagevehicle_id")); + jsonVeExt.put("storagevehicle_code", dto.getString("storagevehicle_code")); + jsonVeExt.put("storagevehicle_type", dto.getString("storagevehicle_type")); + if (StrUtil.isNotEmpty(pcsn)) { + jsonVeExt.put("pcsn", pcsn); + } + if (StrUtil.isNotEmpty(qty)) { + jsonVeExt.put("qty", qty); + } + jsonVeExt.put("device_uuid", org.nl.common.utils.IdUtil.getLongId()); + jsonVeExt.put("update_time", DateUtil.now()); + veExtTab.insert(jsonVeExt); + } else { + if (StrUtil.isNotEmpty(pcsn)) { + ext_jo.put("pcsn", pcsn); + } + if (StrUtil.isNotEmpty(qty)) { + ext_jo.put("qty", qty); + } + veExtTab.update(ext_jo); + } + } JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql index 2b7e6c80a..093bd199d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql @@ -45,6 +45,9 @@ PAGEQUERY SELECT s.*, + ext.pcsn, + ext.qty, + ext.update_time AS change_time, mater.material_code, mater.material_name, point.point_code, @@ -56,6 +59,7 @@ LEFT JOIN ST_IVT_StructIvt ivt ON point.source_id = ivt.struct_id LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id LEFT JOIN md_pb_classstandard class ON class.class_code = s.storagevehicle_type + LEFT JOIN md_pb_storagevehicleext ext ON ext.storagevehicle_code = s.storagevehicle_code WHERE s.is_delete = '0' ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index ef0ffa23143eb1df4ed62f7c81d8e628033a0039..2a3d3b4e49e52c9455e736683e0ba7f8d58871e7 100644 GIT binary patch delta 28734 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 JR!uge{{xra`q}^h diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue index 6c5f6705c..87ea9e338 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue @@ -68,7 +68,7 @@ width="450px" > - +
- - + + + + + + + + 否 @@ -88,8 +94,8 @@
取消 - 生成 - 生成并打印 + 保存 + 保存并打印
@@ -110,8 +116,8 @@ - - + + @@ -180,7 +185,9 @@ const defaultForm = { overstruct_type: null, occupystruct_qty: null, ext_id: null, - num: '1' + num: '1', + qty: null, + pcsn: null } export default { name: 'Storagevehicleinfo',