From 2c4b10ab3a88a8f5134bc9ad672d60587efad5d0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sun, 25 Jun 2023 17:13:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?add=EF=BC=9A=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E3=80=81=E5=8D=8A=E6=88=90=E5=93=81=E3=80=81=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../record/dao/StIvtStructivtflow.java | 15 +-- .../service/IStIvtStructivtflowService.java | 3 + .../impl/StIvtStructivtflowServiceImpl.java | 41 +++++- .../impl/StIvtIostorinvCpOutServiceImpl.java | 15 ++- .../impl/StIvtIostorinvCpServiceImpl.java | 16 ++- .../impl/StIvtStructivtCpServiceImpl.java | 117 ++++++++++++++++++ .../impl/StIvtIostorinvOutYlServiceImpl.java | 25 ++++ .../impl/StIvtIostorinvYlServiceImpl.java | 32 ++++- .../IStIvtStructivtflowYlService.java | 3 + .../structIvt/dao/StIvtStructivtflowYl.java | 2 +- .../impl/StIvtStructivtflowYlServiceImpl.java | 40 ++++++ .../impl/StIvtIostorinvBcpOutServiceImpl.java | 14 +++ .../impl/StIvtIostorinvBcpServiceImpl.java | 19 ++- .../product/productOut/DivDialog.vue | 2 +- 14 files changed, 318 insertions(+), 26 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java index 2029478f..0a241ce4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java @@ -45,12 +45,7 @@ public class StIvtStructivtflow implements Serializable { /** * 物料标识 */ - private String material_code; - - /** - * 物料规格 - */ - private String material_spec; + private String material_id; /** * 批次 @@ -79,7 +74,7 @@ public class StIvtStructivtflow implements Serializable { /** * 单据类型 */ - private String bill_type; + private String bill_type_scode; /** * 单据标识 @@ -104,17 +99,17 @@ public class StIvtStructivtflow implements Serializable { /** * 变动时间 */ - private Date create_time; + private String change_time; /** * 变动人 */ - private String create_id; + private String change_person_id; /** * 变动人姓名 */ - private String create_name; + private String change_person_name; /** * 变动数 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java index 7c56dbaf..ffcef334 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java @@ -1,5 +1,6 @@ package org.nl.wms.storage_manage.basedata.service.record.service; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto; @@ -15,4 +16,6 @@ import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowD public interface IStIvtStructivtflowService extends IService { void recordStructivtFlow(StIvtStructivtflowDto flowDto); + + void insetIvtChange(JSONObject json); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java index d7fc06c8..51c07b9a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java @@ -1,5 +1,7 @@ package org.nl.wms.storage_manage.basedata.service.record.service.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; @@ -13,6 +15,7 @@ import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivt import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,6 +37,8 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl().eq("material_id", flowDto.getMaterial_id())); - flow.setMaterial_code(material.getMaterial_code()); - flow.setMaterial_spec(material.getMaterial_spec()); flow.setPcsn(flowDto.getPcsn()); } 仓库信息:{ @@ -58,9 +61,6 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl row.getIostorinvdtl_id().equals(dao.getIostorinvdtl_id())) .findAny().get(); - iStIvtStructivtCpService.UpdateIvt(ivtDataParam(dao,ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY,dtlDao.getBase_billdtl_id())); + + JSONObject param = ivtDataParam(dao, ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY, dtlDao.getBase_billdtl_id()); + param.put("bill_code",mstDao.getBill_code()); + param.put("inv_id",mstDao.getIostorinv_id()); + param.put("bill_type_scode",mstDao.getBill_type()); + iStIvtStructivtCpService.UpdateIvt(param); // 3）解锁起点 / 将此托盘上的库存全部出掉 unLockNext(dao.getStruct_id()); @@ -826,6 +831,9 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl list : collect.values()) { BigDecimal qty = list @@ -574,7 +578,11 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -177,10 +184,30 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl().eq("stockrecord_id", ivt.getStockrecord_id())); + // 插入库存变动记录 + JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivt)); + param.put("change_type", ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY); + param.put("change_qty",need_qty); + param.put("result_qty", 0); + param.put("bill_code",mst.getBill_code()); + param.put("inv_id",mst.getIostorinv_id()); + param.put("bill_type_scode",mst.getBill_type()); + iStIvtStructivtflowYlService.insetIvtChange(param); + need_qty = NumberUtil.sub(need_qty - canuse_qty).doubleValue(); } JSONObject mst_jo = new JSONObject(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index d140b6dd..11a168e1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,6 +23,7 @@ import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstora import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; @@ -31,6 +33,7 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvd import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -65,6 +68,9 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl { + void insetIvtChange(JSONObject json); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java index e9d62a5c..84080779 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java @@ -100,7 +100,7 @@ public class StIvtStructivtflowYl implements Serializable { /** * 变动时间 */ - private Date change_time; + private String change_time; /** * 变动人 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java index 299d9ed0..4da0a5ff 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java @@ -1,9 +1,17 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtflowYlMapper; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -17,4 +25,36 @@ import org.springframework.stereotype.Service; @Service public class StIvtStructivtflowYlServiceImpl extends ServiceImpl implements IStIvtStructivtflowYlService { + @Autowired + protected IStIvtStructattrService iStIvtStructattrService; // 仓位属性服务 + + @Override + public void insetIvtChange(JSONObject json) { + + StIvtStructattr ivtDao = iStIvtStructattrService.getById(json.getString("struct_id")); + + StIvtStructivtflowYl dao = new StIvtStructivtflowYl(); + dao.setChange_id(IdUtil.getStringId()); + dao.setStruct_id(json.getString("struct_id")); + dao.setStruct_code(json.getString("struct_code")); + dao.setStruct_name(json.getString("struct_name")); + dao.setMaterial_id(json.getString("material_id")); + dao.setQuality_scode(json.getString("quality_scode")); + dao.setIvt_level(json.getString("ivt_level")); + dao.setIs_active(json.getBoolean("is_active")); + dao.setPcsn(json.getString("pcsn")); + dao.setStor_id(ivtDao.getStor_id()); + dao.setChange_type_scode(json.getString("change_type_scode")); + dao.setChange_time(DateUtil.now()); + dao.setChange_person_id(SecurityUtils.getCurrentUserId()); + dao.setChange_person_name(SecurityUtils.getCurrentNickName()); + dao.setChange_qty(json.getBigDecimal("change_qty")); + dao.setResult_qty(json.getBigDecimal("result_qty")); + dao.setQty_unit_id(json.getString("qty_unit_id")); + dao.setProduct_area(json.getString("workshop_id")); + dao.setBill_code(json.getString("bill_code")); + dao.setBill_type_scode(json.getString("bill_type_scode")); + dao.setInv_id(json.getString("inv_id")); + this.save(dao); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java index f8e5b4c5..3d6f1327 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java @@ -40,6 +40,7 @@ import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; +import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; import org.nl.wms.storage_manage.productmanage.util.RuleUtil; import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpOutService; @@ -83,6 +84,8 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl().eq("struct_id", mst.getStruct_id())); + // 插入库存变动记录 + JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao)); + param.put("change_type", ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY); + param.put("change_qty", ivtDao.getCanuse_qty()); + param.put("result_qty", 0); + param.put("bill_code",mst.getBill_code()); + param.put("inv_id",mst.getIostorinv_id()); + param.put("bill_type_scode",mst.getBill_type()); + iStIvtStructivtflowService.insetIvtChange(param); + /*structivtflowService.recordStructivtFlow( StIvtStructivtflowDto.builder() .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index 77c5f58f..b3cfe03d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java @@ -38,6 +38,7 @@ import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivt 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; +import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; import org.nl.wms.storage_manage.productmanage.util.RuleUtil; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; @@ -83,6 +84,8 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl().lambda() diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue index 5fea1256..c1494712 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue @@ -417,7 +417,7 @@ export default { } this.loadingAlldiv = true - productOut.allDivIvt({ 'iostorinvdtl_id': this.currentRow.iostorinvdtl_id, 'sect_id': this.mstrow.sect_id, 'stor_id': this.mstrow.stor_id, 'type': false }).then(res => { + productOut.allDivIvt({ 'iostorinvdtl_id': this.currentRow.iostorinvdtl_id, 'iostorinv_id': this.currentRow.iostorinv_id, 'sect_id': this.mstrow.sect_id, 'stor_id': this.mstrow.stor_id, 'type': false }).then(res => { this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.queryTableDtl() this.loadingAlldiv = false From cb78d9a38b7231bd258a0e6bf9f9a97bd1e3baa4 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sun, 25 Jun 2023 21:13:57 +0800 Subject: [PATCH 2/9] =?UTF-8?q?add=EF=BC=9A=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E3=80=81=E5=8D=8A=E6=88=90=E5=93=81=E3=80=81=E6=88=90=E5=93=81?= =?UTF-8?q?=20=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StIvtStructivtflowBcpController.java | 21 ++- .../mapper/StIvtStructivtflowBcpMapper.java | 6 + .../xml/StIvtStructivtflowBcpMapper.xml | 40 ++++ .../service/IStIvtStructivtflowService.java | 4 + .../impl/StIvtStructivtflowServiceImpl.java | 15 +- .../StIvtStructivtflowCpController.java | 22 ++- .../IStIvtStructivtflowCpService.java | 3 + .../mapper/StIvtStructivtflowCpMapper.java | 6 + .../dao/mapper/StIvtStructivtflowCpMapper.xml | 40 ++++ .../service/structIvt/dto/IvtFlowQuery.java | 33 ++++ .../impl/StIvtStructivtflowCpServiceImpl.java | 12 ++ .../StIvtIostorinvYlOutController.java | 2 +- .../StIvtStructivtflowYlController.java | 22 ++- .../mapper/xml/StIvtIostorinvOutYlMapper.xml | 4 +- .../dao/mapper/xml/StIvtIostorinvYlMapper.xml | 3 +- .../impl/StIvtIostorinvOutYlServiceImpl.java | 8 + .../impl/StIvtIostorinvYlServiceImpl.java | 3 + .../IStIvtStructivtflowYlService.java | 4 + .../mapper/StIvtStructivtflowYlMapper.java | 6 + .../mapper/xml/StIvtStructivtflowYlMapper.xml | 39 ++++ .../impl/StIvtStructivtflowYlServiceImpl.java | 15 +- .../product/productIvtFlow/index.vue | 172 ++++++++++++++++++ .../product/productIvtFlow/productivtFlow.js | 31 ++++ .../rawproduct/rawproductIvtFlow/index.vue | 172 ++++++++++++++++++ .../rawproductIvtFlow/productivtFlow.js | 31 ++++ .../semiproduct/semiproductIvt/index.vue | 2 +- .../semiproduct/semiproductIvtFlow/index.vue | 172 ++++++++++++++++++ .../semiproductIvtFlow/productivtFlow.js | 31 ++++ 28 files changed, 908 insertions(+), 11 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java create mode 100644 mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js create mode 100644 mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue create mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java index 0e32614c..682e083e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/record/StIvtStructivtflowBcpController.java @@ -1,8 +1,16 @@ package org.nl.wms.storage_manage.basedata.controller.record; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** @@ -14,8 +22,17 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtflowBcp") +@RequestMapping("/api/stIvtStructivtflowBcp") public class StIvtStructivtflowBcpController { + @Autowired + private IStIvtStructivtflowService iStIvtStructivtflowService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowService.queryAll(query,page), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java index d099a168..f80ecdb5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java @@ -1,7 +1,12 @@ package org.nl.wms.storage_manage.basedata.service.record.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtflowBcpMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml index 0b9f8883..8eefcdcb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml @@ -2,4 +2,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java index ffcef334..be1d7478 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java @@ -1,9 +1,11 @@ package org.nl.wms.storage_manage.basedata.service.record.service; import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; /** *

@@ -18,4 +20,6 @@ public interface IStIvtStructivtflowService extends IService void recordStructivtFlow(StIvtStructivtflowDto flowDto); void insetIvtChange(JSONObject json); + + Object queryAll(IvtFlowQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java index 51c07b9a..845129a3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java @@ -3,6 +3,10 @@ package org.nl.wms.storage_manage.basedata.service.record.service.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; @@ -16,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -96,7 +101,7 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java index 44d6d7ba..57fdcb8b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java @@ -1,5 +1,15 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-04 */ @RestController -@RequestMapping("/stIvtStructivtflowCp") +@RequestMapping("/api/stIvtStructivtflowCp") public class StIvtStructivtflowCpController { + @Autowired + private IStIvtStructivtflowCpService iStIvtStructivtflowCpService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowCpService.queryAll(query,page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java index 8bbdc523..be92d509 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtflowCpService.java @@ -1,7 +1,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; /** *

@@ -13,4 +15,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct */ public interface IStIvtStructivtflowCpService extends IService { + Object queryAll(IvtFlowQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java index b6eb6948..7cdba28b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java @@ -1,7 +1,12 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +18,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct */ public interface StIvtStructivtflowCpMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml index b113c5f6..28c7d3c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml @@ -2,4 +2,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java new file mode 100644 index 00000000..ca8aa330 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java @@ -0,0 +1,33 @@ +package org.nl.wms.storage_manage.productmanage.service.structIvt.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; + +/* + * @author LXY + * @Date 2023/5/4 19:49 + */ +@Data +public class IvtFlowQuery extends BaseQuery { + + + private String struct_code; + + private String bill_code; + + private String change_type_scode; + + private String material_code; + + private String stor_id; + + @Override + public void paramMapping() { + super.doP.put("struct_code", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java index 4f1585a6..faf0a298 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtflowCpServiceImpl.java @@ -1,9 +1,14 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtflowCpMapper; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.springframework.stereotype.Service; /** @@ -17,4 +22,11 @@ import org.springframework.stereotype.Service; @Service public class StIvtStructivtflowCpServiceImpl extends ServiceImpl implements IStIvtStructivtflowCpService { + @Override + public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java index c647d3f2..606eb7ac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java @@ -50,7 +50,7 @@ public class StIvtIostorinvYlOutController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @PostMapping("/delete") + @DeleteMapping @Log("删除入库单") @ApiOperation("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java index a52d0663..b5c568dd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java @@ -1,8 +1,16 @@ package org.nl.wms.storage_manage.rawmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** @@ -14,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtflowYl") +@RequestMapping("/api/stIvtStructivtflowYl") public class StIvtStructivtflowYlController { + @Autowired + private IStIvtStructivtflowYlService iStIvtStructivtflowYlService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowYlService.queryAll(query,page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml index 830120d0..44f34c69 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml @@ -3,7 +3,7 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml index 53fb1399..98290f81 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml @@ -3,7 +3,7 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java index 93c84768..3a445077 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java @@ -143,6 +143,14 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl dtl_list = iostorinvdtlYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index 11a168e1..37785ddb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -233,6 +233,9 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl * 仓位库存变动记录表 Mapper 接口 @@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtflowYlMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml index 6a06028d..0ba99204 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml @@ -2,4 +2,43 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java index 4da0a5ff..38758536 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java @@ -2,11 +2,16 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtflowYlMapper; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; @@ -44,7 +49,7 @@ public class StIvtStructivtflowYlServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue new file mode 100644 index 00000000..ee541af1 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/index.vue @@ -0,0 +1,172 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js new file mode 100644 index 00000000..994463b0 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowCp', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowCp/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowCp/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue new file mode 100644 index 00000000..c8fba9c9 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue @@ -0,0 +1,172 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js new file mode 100644 index 00000000..bec90c03 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowYl', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowYl/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowYl/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue index 82cfc1b5..0b3ef331 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue @@ -133,7 +133,7 @@ export default { } }, created() { - crudStorattr.getStor({ 'stor_type': '4' }).then(res => { + crudStorattr.getStor({ 'stor_type': '2' }).then(res => { this.storlist = res.content }) }, diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue new file mode 100644 index 00000000..a7605385 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/index.vue @@ -0,0 +1,172 @@ + + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js new file mode 100644 index 00000000..b004d075 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowBcp', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowBcp/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowBcp/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} From bec170a530bbeecea2c5feeb38bb007157c01fd6 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 26 Jun 2023 08:50:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?rev:sap=E5=90=8C=E6=AD=A5=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/hd/nladmin-system/pom.xml | 10 ++-- .../nl/modules/common/utils/StringUtils.java | 32 ++++-------- .../sap/service/impl/WmsToSapServiceImpl.java | 38 ++++++++++---- .../impl/MdPbClassstandardServiceImpl.java | 3 +- .../PdmProduceWorkorderController.java | 23 +++++++-- .../impl/IPdmProduceWorkorderServiceImpl.java | 1 + .../src/main/resources/logback-spring.xml | 50 +++++++++++-------- .../product_manage/workorder/ViewDialog.vue | 7 ++- .../workorder/produceshiftorder.js | 12 ++++- .../staging/kzStaging/index.vue | 25 +++++++++- 10 files changed, 133 insertions(+), 68 deletions(-) diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index 48c80fe6..242486c9 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -58,11 +58,11 @@ - - com.yomahub - tlog-all-spring-boot-starter - 1.5.0 - + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java index b11dc81d..e7343094 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java @@ -143,34 +143,24 @@ public class StringUtils { * 获取ip地址 */ public static String getIp(HttpServletRequest request) { - // TODO 不解析IP地址 - if(true){ - return "127.0.0.1"; - } - - String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + String ip = request.getHeader("X-Forwarded-For"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } - String comma = ","; - String localhost = "127.0.0.1"; - if (ip.contains(comma)) { - ip = ip.split(",")[0]; - } - if (localhost.equals(ip)) { - // 获取本机真正的ip地址 - try { - ip = InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { - log.error(e.getMessage(), e); - } + + if (ip != null && ip.contains(",")) { + String[] ipArray = ip.split(","); + ip = ipArray[0]; } + return ip; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java index e855f82c..93d82246 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.json.XML; @@ -14,6 +15,15 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.common.utils.WebServiceUtil; import org.nl.wms.ext.sap.service.WmsToSapService; +import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +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.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; +import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -25,6 +35,15 @@ import java.util.HashMap; @Slf4j public class WmsToSapServiceImpl implements WmsToSapService { + @Autowired + private IMdPbMeasureunitService mdPbMeasureunitService; + @Autowired + private IMdMeMaterialbaseService materialbaseService; + @Autowired + private IMdCsCustomerbaseService customerbaseService; + @Autowired + private IMpsSaleOrderService saleOrderService; + @Override public JSONObject getMater(JSONObject form) { return null; @@ -103,7 +122,7 @@ public class WmsToSapServiceImpl implements WmsToSapService { for (int i = 0; i < item.size(); i++) { JSONObject row = item.getJSONObject(i); boolean need_update = false; - JSONObject sale_jo = WQLObject.getWQLObject("pcs_sale_order").query("sale_code = '" + row.getString("Vbeln") + "' AND seq_no = '" + row.getString("Posnr") + "'").uniqueResult(0); + JSONObject sale_jo = WQLObject.getWQLObject("pcs_sale_order").query("sale_code = '" + + "' AND seq_no = '" + + "'").uniqueResult(0); if (ObjectUtil.isEmpty(sale_jo)) { sale_jo = new JSONObject(); sale_jo.put("sale_id", IdUtil.getSnowflake(1, 1).nextId()); @@ -119,38 +138,39 @@ public class WmsToSapServiceImpl implements WmsToSapService { sale_jo.put("sale_type", row.getString("Auart")); String material_code = row.getString("Matnr").replaceAll("^(0+)", ""); //获取物料对应的物料标识 - JSONObject mater_jo = WQLObject.getWQLObject("MD_ME_MaterialBase").query("material_code = '" + material_code + "'").uniqueResult(0); + MdMeMaterialbase mater_jo = materialbaseService.getOne(new QueryWrapper().eq("material_code", material_code)); if (ObjectUtil.isEmpty(mater_jo)) { sale_jo.put("material_id", "0"); sale_jo.put("is_success", "0"); sale_jo.put("remark", "未查询到该销售订单对应的物料主数据：" + material_code); err_num++; } else { - String material_id = mater_jo.getString("material_id"); + String material_id =mater_jo.getMaterial_id(); sale_jo.put("material_id", material_id); } sale_jo.put("status", "10"); sale_jo.put("sale_qty", row.getString("Kwmeng")); sale_jo.put("produce_seq", "1"); String cust_code = row.getString("Kunnr"); - JSONObject cust_jo = WQLObject.getWQLObject("md_cs_customerbase").query("cust_code = '" + cust_code + "'").uniqueResult(0); + MdCsCustomerbase cust_jo = customerbaseService.getOne(new QueryWrapper().eq("cust_code", cust_code)); if (ObjectUtil.isNotEmpty(cust_jo)) { - sale_jo.put("cust_id", cust_jo.getString("cust_id")); - sale_jo.put("cust_code", cust_jo.getString("cust_code")); - sale_jo.put("cust_name", cust_jo.getString("cust_name")); + sale_jo.put("cust_id", cust_jo.getCust_id()); + sale_jo.put("cust_code", cust_jo.getCust_code()); + sale_jo.put("cust_name", cust_jo.getCust_name()); } else { sale_jo.put("is_success", "0"); sale_jo.put("remark", "未查询到该销售订单对应的客户信息：" + cust_code); err_num++; } String unit_code = row.getString("Vrkme"); - JSONObject unit_jo = WQLObject.getWQLObject("md_pb_measureunit").query("unit_name = '" + unit_code + "'").uniqueResult(0); + MdPbMeasureunit unit_jo = mdPbMeasureunitService.getOne(new QueryWrapper() + .eq("unit_name", unit_code)); if (ObjectUtil.isEmpty(unit_jo)) { sale_jo.put("qty_unit_id", "0"); sale_jo.put("remark", "未查询到该销售订单对应的单位信息：" + unit_code); err_num++; } else { - sale_jo.put("qty_unit_id", unit_jo.getString("measure_unit_id")); + sale_jo.put("qty_unit_id", unit_jo.getMeasure_unit_id()); } sale_jo.put("plandeliver_date", row.getString("Edatu")); sale_jo.put("create_id", SecurityUtils.getCurrentUserId()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java index 7ba6ffea..167fac99 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java @@ -127,7 +127,8 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl> list = this.listMaps(query); return getMaps(list); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java index e1683602..f08a8bc1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java @@ -169,16 +169,29 @@ public class PdmProduceWorkorderController { @ApiOperation("报工数修改") @SaIgnore public ResponseEntity reportQuery2(ReportQuery param, PageQuery pageQuery) { - Page page = PageHelper - .startPage(pageQuery.getPage() + 1, pageQuery.getSize()) - .setOrderBy("workorder_code desc,seq_number asc"); - param.setOrderby("true"); + Page page = null; + if (pageQuery.getPage() != null && pageQuery.getSize() !=null){ + page = PageHelper + .startPage(pageQuery.getPage() + 1, pageQuery.getSize()) + .setOrderBy("workorder_code desc,seq_number asc"); + param.setOrderby("true"); + } List list = iPdmProduceWorkorderService.reportQuery(param); TableDataInfo build = TableDataInfo.build(list); - build.setTotalElements(page.getTotal()); + if (page!=null){ + build.setTotalElements(page.getTotal()); + } return new ResponseEntity<>(build, HttpStatus.OK); } + @PostMapping("/reportQuery3") + @Log("工单报工数") + @ApiOperation("工单报工数") + @SaIgnore + public ResponseEntity reportQuery3(@RequestBody ReportQuery param) { + return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)), HttpStatus.OK); + } + @Log("导出数据") @ApiOperation("导出数据") @PostMapping(value = "/download") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index c13e3454..f49943d9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -633,6 +633,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl - http://192.168.46.225:9200/_bulk + http://127.0.0.1:9200/_bulk ${esIndex} mes_log es-logger @@ -79,10 +79,8 @@ https://juejin.cn/post/6844903775631572999 - true - + ${log.pattern} - @@ -100,15 +98,14 @@ https://juejin.cn/post/6844903775631572999 20GB - - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - + 0 500 @@ -120,7 +117,6 @@ https://juejin.cn/post/6844903775631572999 - @@ -129,6 +125,10 @@ https://juejin.cn/post/6844903775631572999 + + + + @@ -168,6 +168,10 @@ https://juejin.cn/post/6844903775631572999 + + + + @@ -177,26 +181,36 @@ https://juejin.cn/post/6844903775631572999 + + + - + + - + + - + + - + + - + + \ - + + - + + \ @@ -211,11 +225,5 @@ https://juejin.cn/post/6844903775631572999 - - - - - - diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue index 42f962f2..94965ce2 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue @@ -169,8 +169,7 @@ - 取 消 - 确定 + 关 闭 @@ -257,7 +256,7 @@ export default { open() { this.getworkprocedure() this.getMaterialClass() - crudProduceshiftorder.reportQuery({ workorder_id: this.form.workorder_id }).then(res => { + crudProduceshiftorder.reportQuery3({ workorder_id: this.form.workorder_id }).then(res => { this.tableData = res.content }) }, @@ -276,7 +275,7 @@ export default { 'material_id': this.form.material_id } crudClassstandard.queryClassById(param).then(res => { - this.form.class_name = res.content[0].class_name + this.$set(this.form,'class_name',res.content[0].class_name) }) }, getworkprocedure() { diff --git a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js index 44d2ba5a..a617dae5 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js +++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js @@ -104,6 +104,7 @@ export function getReportWork(data) { } export function reportQuery(data) { + console.log(data) return request({ url: '/api/produceWorkorder/reportQuery2', method: 'get', @@ -111,6 +112,15 @@ export function reportQuery(data) { }) } + +export function reportQuery3(data) { + return request({ + url: '/api/produceWorkorder/reportQuery3', + method: 'post', + data + }) +} + export function excelImport(data) { return request({ url: 'api/produceWorkorder/excelImport', @@ -142,4 +152,4 @@ export function reportApprove(data) { }) } -export default { add, addRows, edit, del, submits, reportApprove, unSubmits, getTable, openStart, saveReport, finish, getReportWork, forceFinish, reportQuery, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice } +export default { add, addRows, edit, del, submits, reportApprove, unSubmits, getTable, openStart, saveReport, finish, getReportWork, forceFinish, reportQuery, reportQuery3, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice } diff --git a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue index 14242cbe..7be83973 100644 --- a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue +++ b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue @@ -44,7 +44,18 @@ - + + + 设置空位 + + { + structIds.push(item.workorder_id) + }) + alert(structIds) + // crudProduceshiftorder.submits(orders).then(res => { + // this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + // this.crud.toQuery() + // }) + }, // 取消下发 setMaterValue(row) { this.materialForm.material_id = row.material_id this.materialForm.material_code = row.material_code From 4c2d84ce83a1fb01878ab8f620d018f8f6271edb Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 26 Jun 2023 08:53:44 +0800 Subject: [PATCH 4/9] =?UTF-8?q?rev:=E9=94=80=E5=94=AE=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java index 93d82246..3937e760 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java @@ -122,7 +122,7 @@ public class WmsToSapServiceImpl implements WmsToSapService { for (int i = 0; i < item.size(); i++) { JSONObject row = item.getJSONObject(i); boolean need_update = false; - JSONObject sale_jo = WQLObject.getWQLObject("pcs_sale_order").query("sale_code = '" + + "' AND seq_no = '" + + "'").uniqueResult(0); + JSONObject sale_jo = WQLObject.getWQLObject("pcs_sale_order").query("sale_code = '" + row.getString("Vbeln") + "' AND seq_no = '" + row.getString("Posnr") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(sale_jo)) { sale_jo = new JSONObject(); sale_jo.put("sale_id", IdUtil.getSnowflake(1, 1).nextId()); From bebc124f64eafcdcb3c468245641759c5ddc36ae Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 26 Jun 2023 08:55:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?add=EF=BC=9A=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/MdCsCustomerbaseController.java | 21 +++ .../customer/IMdCsCustomerbaseService.java | 16 ++ .../customer/dao/MdCsCustomerbase.java | 144 ++++++++++++++++++ .../dao/mapper/MdCsCustomerbaseMapper.java | 16 ++ .../dao/mapper/xml/MdCsCustomerbaseMapper.xml | 5 + .../impl/MdCsCustomerbaseServiceImpl.java | 20 +++ 6 files changed, 222 insertions(+) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java new file mode 100644 index 00000000..4392220a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.master.controller.customer; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 客户基本信息表 前端控制器 + *

+ * + * @author generator + * @since 2023-06-25 + */ +@RestController +@RequestMapping("/mdCsCustomerbase") +public class MdCsCustomerbaseController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java new file mode 100644 index 00000000..c0b3434c --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.master.service.customer; + +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 客户基本信息表 服务类 + *

+ * + * @author generator + * @since 2023-06-25 + */ +public interface IMdCsCustomerbaseService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java new file mode 100644 index 00000000..38db9561 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java @@ -0,0 +1,144 @@ +package org.nl.wms.masterdata_manage.master.service.customer.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 客户基本信息表 + *

+ * + * @author generator + * @since 2023-06-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_cs_customerbase") +public class MdCsCustomerbase implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户标识 + */ + private Long cust_id; + + /** + * 客户编码 + */ + private String cust_code; + + /** + * 客户名称 + */ + private String cust_name; + + /** + * 法人代表 + */ + private String jurid_name; + + /** + * 税务登记号 + */ + private String tax_no; + + /** + * 工商注册号 + */ + private String register_no; + + /** + * 经营许可证号 + */ + private String manage_lice_no; + + /** + * 营业执照 + */ + private String busi_char_name; + + /** + * 行政区划 + */ + private Long area_id; + + /** + * 邮政编码 + */ + private String zip_code; + + /** + * 公司电话 + */ + private String corp_tele_no; + + /** + * 公司地址 + */ + private String corp_address; + + /** + * 创建人 + */ + private Long create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private Long update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 启用时间 + */ + private String is_used_time; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + /** + * 备注 + */ + private String remark; + + /** + * 分类标识 + */ + private Long class_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java new file mode 100644 index 00000000..70114ae6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.master.service.customer.dao.mapper; + +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 客户基本信息表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-25 + */ +public interface MdCsCustomerbaseMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml new file mode 100644 index 00000000..cdef1f82 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java new file mode 100644 index 00000000..71ee6956 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.master.service.customer.impl; + +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import org.nl.wms.masterdata_manage.master.service.customer.dao.mapper.MdCsCustomerbaseMapper; +import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 客户基本信息表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-25 + */ +@Service +public class MdCsCustomerbaseServiceImpl extends ServiceImpl implements IMdCsCustomerbaseService { + +} From 8543e7b152926540b02308cddf6de0f11652a883 Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 26 Jun 2023 14:23:38 +0800 Subject: [PATCH 6/9] =?UTF-8?q?rev:=20=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=95=8C=E9=9D=A2=E5=88=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/qd/src/main.js | 4 - .../product_manage/workorder/ViewDialog.vue | 8 +- .../wms/product_manage/workorder/index.vue | 138 ++++++++++-------- .../views/wms/scheduler_manage/task/index.vue | 8 +- 4 files changed, 88 insertions(+), 70 deletions(-) diff --git a/mes/qd/src/main.js b/mes/qd/src/main.js index ce679a61..9dc4b879 100644 --- a/mes/qd/src/main.js +++ b/mes/qd/src/main.js @@ -5,8 +5,6 @@ import Cookies from 'js-cookie' import 'normalize.css/normalize.css' import Element from 'element-ui' -// 列自适应宽度:https://github.com/legendJaden/AFTableColumn -import AFTableColumn from 'af-table-column' import 'font-awesome/css/font-awesome.css' @@ -44,8 +42,6 @@ import 'jquery' import VueBus from 'vue-bus' Vue.use(scroll) -Vue.use(AFTableColumn) - Vue.use(VueHighlightJS) Vue.use(mavonEditor) Vue.use(permission) diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue index 94965ce2..00d4faac 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue @@ -144,20 +144,20 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -522,7 +529,19 @@ const defaultForm = { } export default { name: 'Produceshiftorder', - components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, reportDialog, UploadDialog, ReplaceDeviceDialog }, + components: { + AddDialog, + pagination, + crudOperation, + rrOperation, + udOperation, + MaterDtl, + Treeselect, + ViewDialog, + reportDialog, + UploadDialog, + ReplaceDeviceDialog + }, mixins: [presenter(), header(), form(defaultForm), crud()], dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'], cruds() { @@ -614,7 +633,10 @@ export default { this.crud.toQuery() }, getNotWorkDeviceByWorkproceduceId(workprocedure_id) { // 根据工序标识获取设备列表 - crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workprocedure_id: workprocedure_id,product_area:this.form.product_area }).then(res => { + crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ + workprocedure_id: workprocedure_id, + product_area: this.form.product_area + }).then(res => { this.deviceList = res.content }) }, diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue index 805fc840..94a2e788 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue @@ -156,13 +156,13 @@ - + - - - + + + From a9547de830180247c184677bea9ce6e6a6289f3c Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 26 Jun 2023 14:30:31 +0800 Subject: [PATCH 7/9] =?UTF-8?q?rev=20=E5=87=BA=E7=BC=93=E5=AD=98=E7=BA=BF?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hailiang_one/ApplyTaskTime.java | 2 +- .../HailiangAutoCacheLineDeviceDriver.java | 6 +++ .../wms/service/impl/AcsToWmsServiceImpl.java | 11 +++-- .../wms/service/impl/WmsToAcsServiceImpl.java | 46 +++++++++++++------ .../org/nl/acs/task/service/dto/TaskDto.java | 2 + 5 files changed, 47 insertions(+), 20 deletions(-) diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/ApplyTaskTime.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/ApplyTaskTime.java index eb2102d2..96faa60f 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/ApplyTaskTime.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/ApplyTaskTime.java @@ -5,5 +5,5 @@ package org.nl.acs.device_driver.basedriver.hailiang_one; * @createDate: 2023/5/24 */ public class ApplyTaskTime { - public final static long APPLY_TIME = 30l; + public final static long APPLY_TIME = 60l; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java index 9619de75..7c00193d 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java @@ -398,6 +398,12 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code()); if (taskDto != null) { taskDto.setVehicle_code(String.valueOf(prepare_barcode)); + String qtyArr = taskDto.getQtyArr(); + if (StrUtil.isNotEmpty(qtyArr)) { + JSONObject qtyJson = JSONObject.parseObject(qtyArr); + String qty = qtyJson.getString(String.valueOf(prepare_barcode)); + taskDto.setQtyArr(qty); + } taskserver.update(taskDto); } } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 97ea8fbd..59dc81fa 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.acs.device.service.DeviceService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.modules.system.service.ParamService; import org.slf4j.MDC; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -24,10 +25,12 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j public class AcsToWmsServiceImpl implements AcsToWmsService { - int a; - private final ParamService paramService; - private final DeviceService deviceService; - private final AddressService addressService; + @Autowired + private ParamService paramService; + @Autowired + private DeviceService deviceService; + @Autowired + private AddressService addressService; public String token; diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 95c011f0..7d1b17dd 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -38,6 +38,7 @@ import org.nl.acs.task.service.dto.TaskDto; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.service.ParamService; import org.nl.modules.wql.core.bean.WQLObject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -51,13 +52,18 @@ import java.util.Map; @Slf4j public class WmsToAcsServiceImpl implements WmsToAcsService { - private final ApplicationContext applicationContext; - private final TaskService taskService; - private final DeviceService deviceService; - private final DeviceAppService deviceAppService; - private final ProduceshiftorderService produceshiftorderService; - private final ParamService paramService; - private final InstructionService instructionService; + @Autowired + private TaskService taskService; + @Autowired + private DeviceService deviceService; + @Autowired + private DeviceAppService deviceAppService; + @Autowired + private ProduceshiftorderService produceshiftorderService; + @Autowired + private ParamService paramService; + @Autowired + private InstructionService instructionService; @Override public Map createFromWms(List tasks) { @@ -82,6 +88,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String priority_floor = task.getString("priority_floor"); String material_code = task.getString("material_code"); String quantity = task.getString("quantity"); + String qtyArr = task.getString("qtyArr"); if (StrUtil.isEmpty(task_id)) { JSONObject json = new JSONObject(); @@ -192,6 +199,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("priority_floor", priority_floor); jo.put("material_code", material_code); jo.put("quantity", quantity); + jo.put("qtyArr", qtyArr); jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); TaskDto task_dto = jo.toJavaObject(TaskDto.class); try { @@ -247,6 +255,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String ealing_device_code = param.getString("ealing_device_code"); String unboxing_device_code = param.getString("unboxing_device_code"); + String lane_tray_template = param.getString("lane_tray_template"); + String tray_num = param.getString("tray_num"); + Map extra_map = param.getJSONObject("extra_map"); String one_box_package_qty = ""; String package_qty = ""; @@ -259,21 +270,24 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (ObjectUtil.isNotEmpty(extra_map)) { //老车间包装工单信息 //每箱袋数 - one_box_package_qty = extra_map.get("one_box_package_qty").toString(); + one_box_package_qty = ObjectUtil.isEmpty(extra_map.get("one_box_package_qty")) ? null : extra_map.get("one_box_package_qty").toString(); //袋数 - package_qty = extra_map.get("package_qty").toString(); + package_qty = ObjectUtil.isEmpty(extra_map.get("package_qty")) ? null : extra_map.get("package_qty").toString(); //每袋数量 - one_package_qty = extra_map.get("one_package_qty").toString(); + one_package_qty = ObjectUtil.isEmpty(extra_map.get("one_package_qty")) ? null : extra_map.get("one_package_qty").toString(); //箱数 - box_num = extra_map.get("box_num").toString(); + box_num = ObjectUtil.isEmpty(extra_map.get("box_num")) ? null : extra_map.get("box_num").toString(); //箱型 - box_type = extra_map.get("box_type").toString(); + box_type = ObjectUtil.isEmpty(extra_map.get("box_type")) ? null : extra_map.get("box_type").toString(); //目标巷道 - target_roadway = extra_map.get("target_roadway").toString(); + target_roadway = ObjectUtil.isEmpty(extra_map.get("target_roadway")) ? null : extra_map.get("target_roadway").toString(); //是否翻转 - is_flip = extra_map.get("is_flip").toString(); + is_flip = ObjectUtil.isEmpty(extra_map.get("is_flip")) ? null : extra_map.get("is_flip").toString(); //托盘满托数量 - tray_full_num = extra_map.get("tray_full_num").toString(); + tray_full_num = ObjectUtil.isEmpty(extra_map.get("tray_full_num")) ? null : extra_map.get("tray_full_num").toString(); + // + lane_tray_template = ObjectUtil.isEmpty(extra_map.get("lane_tray_template")) ? null : extra_map.get("lane_tray_template").toString(); + tray_num = ObjectUtil.isEmpty(extra_map.get("tray_num")) ? null : extra_map.get("tray_num").toString(); } Map params = param.getJSONObject("params"); @@ -357,6 +371,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { dto.setTray_full_num(tray_full_num); dto.setEalingOrderDto(ealingOrderDto); dto.setCreate_by("mes"); + dto.setTray_num(tray_num); + dto.setLane_tray_template(lane_tray_template); try { produceshiftorderService.create(dto); } catch (Exception e) { diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java index 55825e71..19e3c11e 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java @@ -313,4 +313,6 @@ public class TaskDto implements Serializable { private Map ext_param = new HashMap<>(); + private String qtyArr; + } From 50bd42e7d1cafb7209ad563cb4c27b88d906eb4f Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 26 Jun 2023 14:53:48 +0800 Subject: [PATCH 8/9] =?UTF-8?q?rev=EF=BC=9A=E5=B7=A5=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/product_manage/workorder/index.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index 99349977..ece44153 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -16,6 +16,7 @@ clearable filterable size="mini" + style="width: 200px;" placeholder="区域类型" class="filter-item" @change="crud.toQuery()" @@ -28,12 +29,12 @@ - + @@ -42,7 +43,7 @@ - + - + From a3ee2476578156eb717fcd64bcc812428e51636e Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 26 Jun 2023 16:00:03 +0800 Subject: [PATCH 9/9] =?UTF-8?q?rev=EF=BC=9A=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E4=BB=93=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/dao/MdPbStoragevehicleext.java | 1 + .../storage/StructattrController.java | 1 + .../service/check/dao/StIvtCheckdtlCp.java | 2 +- .../impl/StIvtCheckdtlCpServiceImpl.java | 9 +---- .../impl/StIvtCheckmstCpServiceImpl.java | 2 +- .../impl/StIvtMoreorlessdtlCpServiceImpl.java | 16 ++++----- .../impl/StIvtMoreorlessmstCpServiceImpl.java | 16 ++++----- .../StIvtIostorinvBcpController.java | 18 ++++++++++ .../impl/StIvtCheckmstBcpServiceImpl.java | 1 + .../impl/StIvtIostorinvBcpOutServiceImpl.java | 15 +++++++- .../impl/StIvtIostorinvBcpServiceImpl.java | 34 +++++++++++++++++-- .../mapper/xml/StIvtStructivtBcpMapper.xml | 1 + .../product/productCheck/StructIvt.vue | 2 +- .../product/productCheck/index.vue | 4 +-- .../product/productMoreOrless/AddDialog.vue | 11 +----- .../product/productMoreOrless/StructDiv.vue | 5 ++- .../product/productOut/DivDialog.vue | 4 +++ .../semiproductCheck/StructIvt.vue | 2 +- .../semiproduct/semiproductCheck/index.vue | 4 +-- .../semiproductMoreOrless/StructDiv.vue | 5 ++- .../semiproductShutFrame/AddDialog.vue | 2 +- 21 files changed, 104 insertions(+), 51 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java index a2225b97..e6b0e815 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java @@ -28,6 +28,7 @@ public class MdPbStoragevehicleext implements Serializable { /** * 载具编码 */ + @TableId private String storagevehicle_id; /** * 载具编码 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java index 099698c3..a63a67c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java @@ -39,6 +39,7 @@ public class StructattrController { @ApiOperation("查询仓位") //@PreAuthorize("@el.check('structattr:list')") public ResponseEntity queryAll(StructarrQuery query, PageQuery page) { + page.setSort("struct_code ASC"); Page list = ivtStructattrService.page(page.build(StIvtStructattr.class), query.build()); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java index 807590e8..435c56d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java @@ -107,7 +107,7 @@ public class StIvtCheckdtlCp implements Serializable { /** * 是否已下发 */ - private String is_down; + private Boolean is_down; /** * 盘点数量 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java index ce12448a..81ee1250 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java @@ -82,14 +82,7 @@ public class StIvtCheckdtlCpServiceImpl extends ServiceImpl().lambda() - .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getStoragevehicle_code()) - ); - - row.setStoragevehicle_id(vehicleDao.getStoragevehicle_id()); - row.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); + row.setStoragevehicle_id(IdUtil.getStringId()); // 随机生成 row.setStatus(CHECKEnum.DTL_STATUS.code("生成")); this.save(row); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java index 58f24258..efcc1859 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java @@ -544,7 +544,7 @@ public class StIvtCheckmstCpServiceImpl extends ServiceImpl().lambda() - .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getStoragevehicle_code()) - .eq(MdPbStoragevehicleinfo::getIs_used, true) - ); + String storagevehicle_code = row.getStoragevehicle_code(); + if (ObjectUtil.isEmpty(storagevehicle_code)) { + storagevehicle_code = CodeUtil.getNewCode("VEHICCLE_CODE_CDMTP"); + } - if (ObjectUtil.isEmpty(vehicleDao)) throw new BadRequestException("载具不存在!"); - - row.setStoragevehicle_id(vehicleDao.getStoragevehicle_id()); - row.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); - row.setStoragevehicle_type(vehicleDao.getStoragevehicle_type()); + row.setStoragevehicle_code(storagevehicle_code); row.setStatus(MLEnum.DTL_STATUS.code("生成")); this.save(row); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java index c762935f..5599059f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java @@ -181,7 +181,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) @@ -189,7 +189,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,dtl.getStoragevehicle_code()) - ); + );*/ // 更新货位 -- 清除载具号 structattrService.update( @@ -271,7 +271,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) @@ -280,7 +280,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) @@ -358,7 +358,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl() .set("is_delete","1") .in("iostorinv_id",ids)); + + StIvtIostorinvBcp mst = stIvtIostorinvBcpService.getById(ids); + + // 更新载具扩展属性 - 释放载具对应物料关系 清空数量 + iMdPbStoragevehicleextService.update( + new MdPbStoragevehicleext() + .setMaterial_id("") + .setStorage_qty(BigDecimal.valueOf(0)), + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code()) + ); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java index 2da69ec4..c8bdb999 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java @@ -385,6 +385,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code()) + ); + return null; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index b3cfe03d..91e4da1f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.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.acs.service.WmsToAcsService; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; @@ -86,7 +90,10 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getString("storagevehicle_code")) + ); + + if (ObjectUtil.isEmpty(vehicleDao)) throw new BadRequestException("载具不存在！"); + + mst.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); + mst.setStoragevehicle_id(vehicleDao.getStoragevehicle_id()); + + // 更新载具对应物料关系、数量 + MdPbStoragevehicleext vehicleExtDao = iMdPbStoragevehicleextService.getOne( + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, row.getString("storagevehicle_code")) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleExtDao.setStorage_qty(mst.getPlan_qty()); + vehicleExtDao.setMaterial_id(mst.getMaterial_id()); + iMdPbStoragevehicleextService.updateById(vehicleExtDao); + } + } } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index a9e2af27..e092003d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -122,6 +122,7 @@ attr.struct_name, attr.sect_code, attr.sect_name, + attr.stor_name, attr.storagevehicle_code FROM st_ivt_structivt_bcp ivt diff --git a/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue b/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue index 643532a6..489ed42c 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue @@ -27,7 +27,7 @@ v-model="query.bill_code" clearable size="mini" - placeholder="单据号" + placeholder="库区/货位" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" diff --git a/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue b/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue index 9766e95f..d7209e20 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue @@ -131,7 +131,7 @@ > 异常处理 - 导出Excel - + --> - - - +