From 4f2e8b3e2fd811e31823156a17929bd4091be4e3 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 18 Sep 2023 10:12:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?add:=E5=8E=9F=E6=9D=90=E6=96=99=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QlTestInspectionsheetmstServiceImpl.java | 4 +- .../structIvt/StIvtStructivtYlController.java | 12 ++- .../impl/StIvtIostorinvYlServiceImpl.java | 1 + .../dao/mapper/xml/StIvtStructivtYlMapper.xml | 1 + .../src/main/resources/config/application.yml | 2 +- mes/qd/src/views/system/user/index.vue | 4 +- .../deviceFile/equipmentfile/ChangeDialog.vue | 2 +- .../deviceFile/equipmentfile/ViewDialog1.vue | 2 +- .../deviceFile/equipmentfile/ViewDialog2.vue | 2 +- .../device_manage/ios/embiin/AddDialog.vue | 2 +- .../device_manage/ios/embiout/AddDialog.vue | 2 +- .../devicelubricateplan/CopyAddDialog.vue | 2 +- .../repair/devicerepairpa/AddChangeDialog.vue | 2 +- .../repair/devicerepairpa/BomDialog.vue | 2 +- .../repair/devicerepairpa/ReceiveDialog.vue | 2 +- .../repair/devicerepairudit/ReceiveDialog.vue | 2 +- .../device_manage/repair/devicevprs/index.vue | 4 +- .../devicesportcheckplan/CopyAddDialog.vue | 2 +- .../devicemaintenanceplan/CopyAddDialog.vue | 2 +- .../em/devicefaultclass/index.vue | 6 +- .../em/devicelubricateitems/index.vue | 4 +- .../em/devicemaintain/index.vue | 6 +- .../em/devicerepairitems/index.vue | 4 +- .../em/devicesportcheckitems/index.vue | 4 +- .../master/class/UploadDialog.vue | 2 +- .../master/customer/UploadDialog.vue | 2 +- .../master/material/UploadDialog.vue | 2 +- .../semirealrawmaterial/UploadDialog.vue | 2 +- .../ql/productStandard/AddDialog.vue | 4 +- .../src/views/wms/pcs/purchaseplan/index.vue | 2 +- .../wms/pdm/base/productRoute/AddDialog.vue | 2 +- .../pdm/base/productRoute/UploadDialog.vue | 2 +- .../product_manage/workorder/UploadDialog.vue | 2 +- .../product/bucketRecord/UploadDialog.vue | 2 +- .../product/productIn/AddDialog.vue | 2 +- .../product/productIn/DivDialog.vue | 6 +- .../product/productIn/TaskDialog.vue | 2 +- .../product/productMoreOrless/AddDialog.vue | 4 +- .../product/productOut/AddIvt.vue | 2 +- .../product/productOut/DivDialog.vue | 2 +- .../product/productOut/TaskDialog.vue | 2 +- .../product/productOut/index.vue | 2 +- .../rawproduct/rawProductIn/AddDialog.vue | 6 +- .../rawproduct/rawProductIn/AddDtl.vue | 2 +- .../rawproduct/rawProductIn/ViewDialog.vue | 4 +- .../rawproduct/rawProductIvt/index.vue | 89 ++++++++++++++++++- .../rawproduct/rawProductIvt/productivt.js | 6 +- .../rawproduct/rawProductOut/AddDialog.vue | 2 +- .../rawproductmoreOrless/AddDialog.vue | 2 +- .../semiproduct/semiproductIn/index.vue | 2 +- .../semiproductMoreOrless/AddDialog.vue | 2 +- .../semiproductShutFrame/AddDialog.vue | 8 +- 52 files changed, 168 insertions(+), 75 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java index bd12848b..a1edc3fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java @@ -134,8 +134,8 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl @@ -72,5 +70,11 @@ public class StIvtStructivtYlController { public ResponseEntity getAllRawIvt(StructIvtYLQuery query, PageQuery page) { return new ResponseEntity<>(structivtYlService.getAllRawIvt(query, page), HttpStatus.OK); } + @GetMapping("/update") + @Log("更新原料库存") + //("查询原料库存") + public ResponseEntity update(@RequestBody JSONObject form) { + return new ResponseEntity<>(HttpStatus.OK); + } } 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 de36dd87..1a45c564 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 @@ -161,6 +161,7 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl + order by instorage_time desc + SELECT + * + FROM + sys_user + + is_used = '1' + + and username = #{query.username} + + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiRepairDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiRepairDeviceServiceImpl.java new file mode 100644 index 00000000..764dd3bd --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiRepairDeviceServiceImpl.java @@ -0,0 +1,33 @@ +package org.nl.wms.masterdata_manage.service.em.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery; +import org.nl.wms.masterdata_manage.service.em.EmBiRepairDeviceService; +import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice; +import org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiRepairDeviceMapper; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 人员设备关系表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-06 + */ +@Service +public class EmBiRepairDeviceServiceImpl extends ServiceImpl implements EmBiRepairDeviceService { + + @Override + public List queryAll(DeviceUserQuery query) { + return this.baseMapper.queryAll(query); + } + + @Override + public List queryAllDevice(DeviceUserQuery query) { + return this.baseMapper.queryAllDevice(query); + } +} diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/SelectDeviceDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/SelectDeviceDialog.vue new file mode 100644 index 00000000..5553447c --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/SelectDeviceDialog.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/dictDetail.vue b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/dictDetail.vue new file mode 100644 index 00000000..c5be0929 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/dictDetail.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/index.vue new file mode 100644 index 00000000..6d50e54b --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/index.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice.js b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice.js new file mode 100644 index 00000000..a07bdb1a --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice.js @@ -0,0 +1,67 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/embirepairdevice', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/embirepairdevice/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/embirepairdevice', + method: 'put', + data + }) +} + +export function addPersons(data) { + return request({ + url: 'api/embirepairdevice/addPersons', + method: 'post', + data + }) +} + +export function getHeader(data) { + return request({ + url: 'api/embirepairdevice/getHeader', + method: 'post', + data + }) +} + +export function getDeviceIdByUserId(data) { + return request({ + url: 'api/embirepairdevice/getDeviceIdByUserId', + method: 'post', + data + }) +} + +export function addDevices(data) { + return request({ + url: 'api/embirepairdevice/addDevices', + method: 'post', + data + }) +} + +export function deleteRow(data) { + return request({ + url: 'api/embirepairdevice/deleteRow', + method: 'delete', + data + }) +} + +export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices } From e4f9467b03ec6253a91c3fbd8c448009e502ffd8 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 18 Sep 2023 17:43:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?add:=E6=97=A5=E5=BA=93=E5=AD=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=EF=BC=9Atodu:=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B7=9F=E9=A1=B5=E9=9D=A2=EF=BC=9Brev:cp?= =?UTF-8?q?=E7=BC=BA=E5=B0=91stor=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StIvtStructivtDailyController.java | 51 +++++++++++ .../IStIvtStructivtDailyService.java | 20 +++++ .../dao/StIvtStructivtDaily.java | 90 +++++++++++++++++++ .../dao/mapper/StIvtStructivtDailyMapper.java | 24 +++++ .../mapper/xml/StIvtStructivtDailyMapper.xml | 5 ++ .../dto/DailyStructivtQuery.java | 35 ++++++++ .../impl/StIvtStructivtDailyServiceImpl.java | 64 +++++++++++++ .../mapper/xml/StIvtStructivtDailyMapper.xml | 5 ++ .../structIvt/dao/StIvtStructivtBcp.java | 12 +++ .../src/main/resources/sql/日库存.sql | 21 +++++ 10 files changed, 327 insertions(+) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/IStIvtStructivtDailyService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dto/DailyStructivtQuery.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructivtDailyMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/resources/sql/日库存.sql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java new file mode 100644 index 00000000..02452e41 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java @@ -0,0 +1,51 @@ +package org.nl.wms.masterdata_manage.storage.controller.dailyStructivt; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.IStIvtStructivtDailyService; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dto.DailyStructivtQuery; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; +import org.nl.wms.masterdata_manage.storage.service.storage.dto.SectattrQuery; +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; + +/** + *

+ * 日库存统计表 前端控制器 + *

+ * + * @author generator + * @since 2023-09-18 + */ +@RestController +@RequestMapping("api/structivtDaily") +@SaIgnore +public class StIvtStructivtDailyController { + + @Autowired + private IStIvtStructivtDailyService stIvtStructivtDailyService; + + @GetMapping + @Log("查询日库区") + @SaIgnore + public ResponseEntity query(DailyStructivtQuery query, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(stIvtStructivtDailyService.page(page.build(),query.build())),HttpStatus.OK); + } + @GetMapping("/sync") + @Log("同步日库区") + @SaIgnore + public ResponseEntity sync(String[] structivts){ + stIvtStructivtDailyService.dailyStructivt(structivts); + return new ResponseEntity<>(HttpStatus.OK); + } +} + 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 new file mode 100644 index 00000000..75f4779f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/IStIvtStructivtDailyService.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.storage.service.dailyStructivt; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.StIvtStructivtDaily; + +/** + *

+ * 日库存统计表 服务类 + *

+ * + * @author generator + * @since 2023-09-18 + */ +public interface IStIvtStructivtDailyService extends IService { + + /** + * 统计日常数据 + */ + void dailyStructivt(String...structivts); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java new file mode 100644 index 00000000..b2f3a0a1 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java @@ -0,0 +1,90 @@ +package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao; + +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 日库存统计表 + *

+ * + * @author generator + * @since 2023-09-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("st_ivt_structivt_daily") +public class StIvtStructivtDaily implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 库存记录标识 + */ + @TableId + private String id; + + /** + * 仓库标识 + */ + private String stor_id; + + /** + * 仓库表 + */ + private String table_name; + + /** + * 车间标识 + */ + private String product_area; + + /** + * 货位集合 + */ + private String struct_code; + + /** + * 计量单位标识 + */ + private String qty_unit_id; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 可用数 + */ + private BigDecimal canuse_qty; + + /** + * 冻结数 + */ + private BigDecimal frozen_qty; + + /** + * 库存数 + */ + private BigDecimal ivt_qty; + + /** + * 待入数 + */ + private BigDecimal warehousing_qty; + + + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java new file mode 100644 index 00000000..76bd26c2 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java @@ -0,0 +1,24 @@ +package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.StIvtStructivtDaily; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 日库存统计表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-09-18 + */ +public interface StIvtStructivtDailyMapper extends BaseMapper { + + @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") + List selectStructivt(@Param("table") String table); +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml new file mode 100644 index 00000000..fd4511cc --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 new file mode 100644 index 00000000..9705f65a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dto/DailyStructivtQuery.java @@ -0,0 +1,35 @@ +package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.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.masterdata_manage.storage.service.dailyStructivt.dao.StIvtStructivtDaily; + +/* + * @author ZZQ + * @Date 2023/5/14 17:13 + */ +@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 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()); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java new file mode 100644 index 00000000..5fc32c93 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java @@ -0,0 +1,64 @@ +package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.impl; + + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.IStIvtStructivtDailyService; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.StIvtStructivtDaily; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper.StIvtStructivtDailyMapper; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import javax.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +/** + *

+ * 日库存统计表 服务实现类 + *

+ * + * @author generator + * @since 2023-09-18 + */ +@Service +public class StIvtStructivtDailyServiceImpl extends ServiceImpl implements IStIvtStructivtDailyService { + + @Override + @Transactional + public void dailyStructivt(String... structivts) { + if (structivts.length == 0){ + return; + } + ArrayList list = new ArrayList<>(); + for (String structivt : structivts) { + List maps = this.baseMapper.selectStructivt(structivt); + if (!CollectionUtils.isEmpty(maps)){ + List dailyList = JSONArray.parseArray(JSON.toJSONString(maps), StIvtStructivtDaily.class); + list.addAll(dailyList); + } + } + if (!CollectionUtils.isEmpty(list)){ + List errorData = list.stream().filter(stIvtStructivtDaily -> StringUtils.isEmpty(stIvtStructivtDaily.getStor_id()) || StringUtils.isEmpty(stIvtStructivtDaily.getMaterial_id())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(errorData)){ + throw new BadRequestException("表存在异常数据没有仓库跟物料信息:"+errorData + .stream() + .map(stIvtStructivtDaily-> stIvtStructivtDaily.getTable_name()+".仓位:"+stIvtStructivtDaily.getStruct_code()+".物料"+stIvtStructivtDaily.getMaterial_id()) + .distinct().collect(Collectors.joining(","))); + } + Set collect = list.stream().map(StIvtStructivtDaily::getStor_id).collect(Collectors.toSet()); + this.remove(new QueryWrapper().in("stor_id",collect).eq("create_time", DateUtil.now())); + this.saveBatch(list); + } + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructivtDailyMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructivtDailyMapper.xml new file mode 100644 index 00000000..317a035a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructivtDailyMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java index 88050f46..85766131 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java @@ -72,6 +72,18 @@ public class StIvtStructivtBcp implements Serializable { * 库存数 */ private BigDecimal canuse_qty; + /** + * 库存数 + */ + private BigDecimal frozen_qty; + /** + * 库存数 + */ + private BigDecimal ivt_qty; + /** + * 库存数 + */ + private BigDecimal warehousing_qty; /** * 计量单位标识 diff --git a/mes/hd/nladmin-system/src/main/resources/sql/日库存.sql b/mes/hd/nladmin-system/src/main/resources/sql/日库存.sql new file mode 100644 index 00000000..590bf01b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/sql/日库存.sql @@ -0,0 +1,21 @@ +CREATE TABLE `st_ivt_structivt_daily` ( + `id` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '库存记录标识', + `stor_id` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '仓库标识', + `struct_id` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '仓位标识', + `struct_code` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '仓位编码', + `struct_name` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '仓位名称', + `material_id` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '物料标识', + `canuse_qty` decimal(18,6) NOT NULL DEFAULT '0.000000' COMMENT '可用数', + `frozen_qty` decimal(18,6) DEFAULT '0.000000' COMMENT '冻结数', + `ivt_qty` decimal(18,6) NOT NULL DEFAULT '0.000000' COMMENT '库存数', + `warehousing_qty` decimal(18,6) DEFAULT '0.000000' COMMENT '待入数', + `qty_unit_id` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '计量单位标识', + `create_time` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL COMMENT '创建时间', + `product_area` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL COMMENT '车间标识', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='日库存统计表'; + +ALTER TABLE st_ivt_structivt_bcp + ADD COLUMN `frozen_qty` decimal(18,3) DEFAULT '0.000' COMMENT '冻结数', + ADD COLUMN `ivt_qty` decimal(18,3) NOT NULL DEFAULT '0.000' COMMENT '库存数', + ADD COLUMN `warehousing_qty` decimal(18,3) DEFAULT '0.000' COMMENT '待入数'; From 531062d9f6dc44bdbe44f93423dca729c85077ba Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 19 Sep 2023 14:46:47 +0800 Subject: [PATCH 5/6] =?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 +
+
+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + + + From 3d682bb7854936fd5c2577e9ff92757cd259124f Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 19 Sep 2023 14:48:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?rev:=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/hd/nladmin-system/src/main/resources/config/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index a1b17757..2cd47978 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev3 + active: prod jackson: time-zone: GMT+8 data: