From 28a203ca3d3405a4fd7e6993dfe483cc444c6082 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 7 Aug 2023 15:00:38 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=9B=98=E7=82=B9=E5=87=BA?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/storage_manage/IOSEnum.java | 2 + .../nl/wms/storage_manage/pda/PDAEnum.java | 4 +- .../check/StIvtCheckmstHrBcpController.java | 8 ++ .../check/IStIvtCheckmstHrBcpService.java | 5 + .../service/check/dao/StIvtCheckdtlHrBcp.java | 7 +- .../impl/StIvtCheckmstHrBcpServiceImpl.java | 101 ++++++++++++++++-- .../java/org/nl/wms/storage_manage/stivt.xls | Bin 432128 -> 432128 bytes .../semiproductHrCheck/CheckDialog.vue | 27 ++++- .../semiproducthr/semiproductHrCheck/check.js | 9 ++ .../semiproductHrCheck/index.vue | 2 +- 10 files changed, 151 insertions(+), 14 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index c7d615e7..5a0ed5e3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -36,6 +36,8 @@ public enum IOSEnum { ORDER_STATUS(MapOf.of("生成", "10", "提交", "20", "发货中", "30", "确认", "99")), //锁定类型 LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3","损溢锁", "4","拼盘锁","5","其他锁","99")), + // 海柔半成品出库类型 + BILL_TYPE_HR(MapOf.of("生产出库", "1001", "盘点出库", "1002", "手工出库", "1009")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java index 016f2598..03aa0405 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java @@ -12,11 +12,13 @@ import java.util.Map; @Getter public enum PDAEnum { //点位区域 - REGION_CODE(MapOf.of("半成品入库区域", "A1_BCPRK01", "半成品出库区域", "A1_BCPCK01","成品入库区域", "A1_CPRK01","半成品盘点区域", "A1_BCP_PP")), + REGION_CODE(MapOf.of("半成品入库区域", "A1_BCPRK01", "半成品出库区域", "A1_BCPCK01","成品入库区域", "A1_CPRK01","半成品盘点区域", "A1_BCP_PP","海柔半成品出库区域","A3_BCPCK01")), //库区编码 SECT_CODE(MapOf.of("半成品库区", "KQ005")), //库区id SECT_ID(MapOf.of("成品库区", "1528631043496742912")), + //仓库id + STOR_ID(MapOf.of("紫铜三线半成品仓库", "15286279952695336963")), //物料类别 MATERIAL_CLASS(MapOf.of("管件原材料", "1503644349995552768","管件半成品", "1528555443906023424","管件成品", "1528555444031852544")), ; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/check/StIvtCheckmstHrBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/check/StIvtCheckmstHrBcpController.java index a969fdba..95d13292 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/check/StIvtCheckmstHrBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/check/StIvtCheckmstHrBcpController.java @@ -72,5 +72,13 @@ public class StIvtCheckmstHrBcpController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @PostMapping("/checkOut") + @Log("盘点出库") + //("盘点出库") + public ResponseEntity checkOut(@RequestBody JSONObject whereJson) { + checkmstBcpService.checkOut(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/IStIvtCheckmstHrBcpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/IStIvtCheckmstHrBcpService.java index d47fd65a..5cdf1d63 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/IStIvtCheckmstHrBcpService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/IStIvtCheckmstHrBcpService.java @@ -66,4 +66,9 @@ public interface IStIvtCheckmstHrBcpService extends IService */ void taskOperate(JSONObject jo); + /** + * 盘点出库 + * @param whereJson / + */ + void checkOut(JSONObject whereJson); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/dao/StIvtCheckdtlHrBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/dao/StIvtCheckdtlHrBcp.java index d48f0c01..41783dd0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/dao/StIvtCheckdtlHrBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/dao/StIvtCheckdtlHrBcp.java @@ -158,5 +158,10 @@ public class StIvtCheckdtlHrBcp implements Serializable { * 任务标识 */ private String task_id; - + + /** + * 备注 + */ + private String remark; + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java index 2e2afe4c..dfd99ba5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java @@ -25,6 +25,10 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext_manage.acs.service.WmsToAcsService; +import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; +import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; +import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; +import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; @@ -37,6 +41,7 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.nl.wms.storage_manage.CHECKEnum; import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.IVTEnum; import org.nl.wms.storage_manage.pda.PDAEnum; import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckdtlBcp; import org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckdtlBcpMapper; @@ -47,6 +52,7 @@ import org.nl.wms.storage_manage.semimanagehr.service.check.dao.StIvtCheckmstHrB import org.nl.wms.storage_manage.semimanagehr.service.check.dao.mapper.StIvtCheckdtlHrBcpMapper; import org.nl.wms.storage_manage.semimanagehr.service.check.dao.mapper.StIvtCheckmstHrBcpMapper; import org.nl.wms.storage_manage.semimanagehr.service.check.dto.CheckHrQuery; +import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvHrBcpOutService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -78,18 +84,21 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl().lambda() + .eq(StIvtCheckdtlHrBcp::getTask_id, task_id) + ); + } } + @Override + @Transactional + public void checkOut(JSONObject whereJson) { + // 校验 + StIvtCheckdtlHrBcp dtlDao = checkdtlBcpService.getOne( + new QueryWrapper().lambda() + .eq(StIvtCheckdtlHrBcp::getCheckdtl_id, whereJson.getString("checkdtl_id")) + ); + + if (!dtlDao.getCheck_result().equals(CHECKEnum.CHECK_RESULT.code("异常"))) { + throw new BadRequestException("此货位不是异常货位，请正常出库！"); + } + + /* + * 组织出库数据 + */ + JSONObject param = new JSONObject(); + param.put("biz_date", DateUtil.today()); + param.put("bill_type", IOSEnum.BILL_TYPE_HR.code("盘点出库")); + param.put("remark", "盘点单生成"); + param.put("product_code", "A3"); + + // 出库点 + SchBasePoint pointDao = iSchBasePointService.getOne( + new QueryWrapper().lambda() + .eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("海柔半成品出库区域")) + .eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是")) + .eq(SchBasePoint::getIs_delete, IOSEnum.IS_USED.code("否")) + , false); + if (ObjectUtil.isEmpty(pointDao)) throw new BadRequestException("出库点位异常!"); + param.put("point_code", pointDao.getPoint_code()); + + // 仓库 + param.put("stor_id", PDAEnum.STOR_ID.code("紫铜三线半成品仓库")); + param.put("auto_send", true); + + JSONArray tableData = new JSONArray(); + JSONObject row = new JSONObject(); + row.put("material_id", dtlDao.getMaterial_id()); + row.put("plan_qty", dtlDao.getBase_qty()); + row.put("quality_scode", IVTEnum.QUALITY_SCODE.code("合格品")); + + MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(whereJson.getString("material_id")); + MdPbMeasureunit unitDao = iMdPbMeasureunitService.getById(materDao.getBase_unit_id()); + + row.put("qty_unit_id", unitDao.getMeasure_unit_id()); + row.put("qty_unit_name", unitDao.getUnit_name()); + row.put("unit_weight", materDao.getNet_weight()); + row.put("storagevehicle_code", dtlDao.getStoragevehicle_code()); + + StIvtStructattr attrDao = structattrService.getOne( + new QueryWrapper().lambda() + .eq(StIvtStructattr::getStruct_code, whereJson.getString("struct_code")) + .eq(StIvtStructattr::getIs_used, IOSEnum.IS_USED.code("是")), false + ); + + row.put("sect_id", attrDao.getSect_id()); + row.put("sect_code", attrDao.getSect_code()); + row.put("sect_name", attrDao.getSect_name()); + row.put("struct_id", attrDao.getStruct_id()); + row.put("struct_code", attrDao.getStruct_code()); + row.put("struct_name", attrDao.getStruct_name()); + + tableData.add(row); + param.put("tableData",tableData); + + // 调用半成品出库服务 + iStIvtIostorinvHrBcpOutService.create(param); + } + @Override @Transactional public void delete(Long[] ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls index 3f1244936f27cec7e97d5b0d1b700000cb8adbfc..620e21b7103a3e10b5b87dfbea5febad857a9c93 100644 GIT binary patch delta 12725 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 下发任务 + + 盘点出库 + @@ -124,7 +135,8 @@ - + + @@ -156,7 +168,7 @@ export default { type: Object } }, - dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'CHECK_DTL_STATUS', 'check_result'], + dicts: ['CHECK_BILL_STATUS', 'ST_INV_CK_TYPE', 'CHECK_DTL_STATUS', 'check_result_hr'], data() { return { dialogVisible: false, @@ -301,7 +313,7 @@ export default { return this.dict.label.CHECK_DTL_STATUS[row.status] }, check_resultFormat(row, column) { - return this.dict.label.check_result[row.check_result] + return this.dict.label.check_result_hr[row.check_result] }, addrow() { if (this.nowrow === null) { @@ -387,6 +399,15 @@ export default { }) }) }, + checkOut() { + if (this.nowrow === null) { + this.crud.notify('请先选中一条已存在的库存明细！', CRUD.NOTIFICATION_TYPE.INFO) + return false + } + check.checkOut(this.nowrow).then(res => { + this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) + }) + }, saveCheck() { if (this.tableData.length === 0) { this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO) diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/check.js b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/check.js index 105ca994..ee006eef 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/check.js +++ b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/check.js @@ -119,10 +119,19 @@ export function issueTask(data) { }) } +export function checkOut(data) { + return request({ + url: '/api/bcp/checkHr/checkOut', + method: 'post', + data + }) +} + export default { add, edit, del, + checkOut, getCheckDtl, getStructIvt, getOutBillDtl2, diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/index.vue b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/index.vue index 3ea86361..5ba17de3 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/index.vue @@ -263,7 +263,7 @@ export default { if (current !== null) { this.currentRow = current this.downdtl_flag = false - if (current.status === '10' || current.status === '30') { + if (current.status === '10' || current.status === '30' || current.status === '99') { this.check_flag = false } else { this.check_flag = true