From 531062d9f6dc44bdbe44f93423dca729c85077ba Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 19 Sep 2023 14:46:47 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=97=A5=E5=BA=93=E5=AD=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MdPbMeasureunitController.java | 15 ++ .../IStIvtStructivtDailyService.java | 1 + .../dao/StIvtStructivtDaily.java | 26 +++ .../dao/mapper/StIvtStructivtDailyMapper.java | 2 +- .../dto/DailyStructivtQuery.java | 15 +- .../org/nl/wms/storage_manage/IOSEnum.java | 4 +- .../impl/StIvtMoveinvCpServiceImpl.java | 6 +- .../impl/StIvtIostorinvBcpOutServiceImpl.java | 2 +- .../impl/StIvtIostorinvBcpServiceImpl.java | 4 +- .../impl/StIvtMoveinvBcpServiceImpl.java | 2 +- .../StIvtMoreorlessmstBcpServiceImpl.java | 2 +- .../structIvt/dao/StIvtStructivtBcp.java | 2 +- .../StIvtIostorinvHrBcpOutServiceImpl.java | 4 +- .../src/main/resources/sql/日库存.sql | 3 + .../wms/basedata/master/mdPbMeasureunit.js | 8 +- .../st/dailyStructivt/dailyStructivt.js | 26 +++ .../st/dailyStructivt/index.vue | 200 ++++++++++++++++++ 17 files changed, 297 insertions(+), 25 deletions(-) create mode 100644 mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js create mode 100644 mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java index 44a4b860..2753673e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java @@ -9,8 +9,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.MapOf; 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.master.dto.UnitQuery; @@ -22,7 +24,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @author loujf @@ -45,6 +49,17 @@ public class MdPbMeasureunitController { return new ResponseEntity<>(measureunitService.pageQuery(query, page), HttpStatus.OK); } + @GetMapping("/select") + @Log("查询单位下拉列表设备") + public ResponseEntity selectAll(){ + List list = measureunitService.list(); + List result = new ArrayList<>(); + for (MdPbMeasureunit item : list) { + result.add(MapOf.of("label",item.getUnit_name(),"value",item.getMeasure_unit_id())); + } + return new ResponseEntity<>(TableDataInfo.build(result),HttpStatus.OK); + } + @PostMapping("/add") @Log("新增计量单位") //("新增计量单位") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/IStIvtStructivtDailyService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/IStIvtStructivtDailyService.java index 75f4779f..00e3c076 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/IStIvtStructivtDailyService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/IStIvtStructivtDailyService.java @@ -17,4 +17,5 @@ public interface IStIvtStructivtDailyService extends IService { - @Select("select #{table} as table_name,'A1' as product_area, UUID_SHORT() id,material_id,sum(canuse_qty) canuse_qty ,sum(frozen_qty) frozen_qty,sum(ivt_qty) ivt_qty,sum(warehousing_qty) warehousing_qty,GROUP_CONCAT(struct_code) struct_code,stor_id,qty_unit_id,CURDATE() create_time from ${table} GROUP BY material_id") + @Select("SELECT #{table} AS table_name,GROUP_CONCAT(a.struct_code) struct_code, 'A1' AS product_area, st_ivt_structattr.stor_id,st_ivt_structattr.stor_name , st_ivt_structattr.sect_id,st_ivt_structattr.sect_name , UUID_SHORT( ) id,a.material_id,md_me_materialbase.material_code,md_me_materialbase.material_spec, sum( canuse_qty ) canuse_qty, sum( frozen_qty ) frozen_qty, sum( ivt_qty ) ivt_qty, sum( warehousing_qty ) warehousing_qty, qty_unit_id, CURDATE( ) create_time FROM ${table} as a left join st_ivt_structattr on a.struct_code = st_ivt_structattr.struct_code left join md_me_materialbase on a.material_id = md_me_materialbase.material_id GROUP BY material_id") List selectStructivt(@Param("table") String table); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dto/DailyStructivtQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dto/DailyStructivtQuery.java index 9705f65a..ef977809 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dto/DailyStructivtQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dto/DailyStructivtQuery.java @@ -13,23 +13,14 @@ import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.StIvtStru @Data public class DailyStructivtQuery extends BaseQuery { - private String is_materialstore; - private String is_reversed; - private String is_attachment; - private String is_productstore; - private String is_semi_finished; - private String is_virtualstore; + + private String stor_id; private String sect_id; private String struct_code; - private String lock_type; - private Boolean is_used; - private Boolean emptyvehicle; - private Boolean is_emptyvehicle; private String blurry; @Override public void paramMapping() { - super.doP.put("blurry", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); - super.doP.put("emptyvehicle", QParam.builder().k(new String[]{"storagevehicle_code"}).type(QueryTEnum.NULL_OR_EMPTY).build()); + super.doP.put("blurry", QParam.builder().k(new String[]{"material_code","material_spec"}).type(QueryTEnum.ORLK).build()); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index 827b1581..e7db0623 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -37,9 +37,11 @@ public enum IOSEnum { //锁定类型 LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3","损溢锁", "4","拼盘锁","5","移库锁","10","其他锁","99")), // 海柔半成品出入库类型 - BILL_TYPE_HR(MapOf.of("生产出库", "1001", "盘点出库", "1002", "手工出库", "1009","生产入库","0001")), + BILL_TYPE_HR(MapOf.of("生产出库", "1001", "盘点出库", "1002", "手工出库", "1009","生产入库","0001","手工入库", "0009")), // 半成品出入类型 BILL_TYPE_BCP(MapOf.of("清洗入库", "0001", "手工入库", "0009","生产出库","1001","手工出库","1009")), + + ST_INV_CP_TYPE(MapOf.of("生产出库", "1001", "盘点出库", "1002", "移库出库", "1003","手工出库", "1009","生产入库","0001","移库入库","0003","手工入库", "0009")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moveInv/impl/StIvtMoveinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moveInv/impl/StIvtMoveinvCpServiceImpl.java index 6b73fcc9..264f1c42 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moveInv/impl/StIvtMoveinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moveInv/impl/StIvtMoveinvCpServiceImpl.java @@ -284,7 +284,8 @@ public class StIvtMoveinvCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,form.getString("storagevehicle_code")) ); - + } } @@ -335,7 +335,7 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl +
+
+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + + +