From 18452c8181df4ddbcfdcf6e466738d3eba927c7d Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Tue, 19 Sep 2023 17:54:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=AD=98=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaterialbaseServiceImpl.java | 9 ++ .../PcsIfPurchaseorderController.java | 3 +- .../purchase/IPcsIfPurchaseorderService.java | 3 +- .../purchase/dao/PcsIfPurchaseorder.java | 7 ++ .../impl/PcsIfPurchaseorderServiceImpl.java | 44 ++++--- .../iostorInv/dao/StIvtIostorinvdisYl.java | 5 + .../impl/StIvtIostorinvYlServiceImpl.java | 3 + .../impl/StIvtIostorinvdisYlServiceImpl.java | 114 ++++++++++-------- .../structIvt/dao/StIvtStructivtYl.java | 13 ++ 9 files changed, 127 insertions(+), 74 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java index ab4f87dd..a13d392b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java @@ -137,6 +137,15 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ return dto; } + public MaterialbaseDto findById(String material_id) { + MdMeMaterialbase materialbase = materialbaseService.getOne(new QueryWrapper().eq("material_id", material_id)); + MdPbMeasureunit unit = mdPbMeasureunitService.getOne(new QueryWrapper().eq("measure_unit_id", materialbase.getBase_unit_id())); + MaterialbaseDto dto = new MaterialbaseDto(); + BeanUtils.copyProperties(materialbase, dto); + dto.setBase_unit_name(unit.getUnit_name()); + return dto; + } + @Override public MaterialbaseDto findByCode(String code) { if(StrUtil.isNotEmpty(code) && code.contains("\\")) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java index 3c83c24f..3a35659b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java @@ -91,7 +91,8 @@ public class PcsIfPurchaseorderController{ @PostMapping("/update") @Log("修改原料计划") //("修改原料需求") - public ResponseEntity update(@RequestBody JSONObject whereJson) { + public ResponseEntity update(@RequestBody JSONObject whereJson) + throws ParseException { purchaseorderService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java index f26f60d7..75f0543a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java @@ -57,5 +57,6 @@ public interface IPcsIfPurchaseorderService extends IService /** * 原料需求单修改 */ - void update(JSONObject form); + void update(JSONObject form) + throws ParseException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java index 30c80cd0..9ef1ea41 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; @@ -178,4 +179,10 @@ public class PcsIfPurchaseorder implements Serializable{ * 对应半成品物料规格 */ private String semireal_spec; + + /** + * aps到货时间 + */ + private Date aps_instorage_time; + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java index 3ec9b276..95b1285b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import lombok.Data; import org.apache.poi.hpsf.Decimal; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -192,6 +193,8 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl implements IStIvtIostorinvdisYlService { +public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl implements IStIvtIostorinvdisYlService{ + @Autowired + private IStIvtSectattrService sectattrService; + @Autowired + private IStIvtStructattrService structattrService; + @Resource + private MaterialbaseServiceImpl materialbaseService; - @Autowired - private IStIvtSectattrService sectattrService; - @Autowired - private IStIvtStructattrService structattrService; + @Override + public void create(JSONObject jo, JSONObject mst_jo) { + if(ObjectUtil.isNotEmpty(mst_jo)) { + String mst_id = mst_jo.getString("mst_id"); + String dtl_id = mst_jo.getString("dtl_id"); + String iostorinvdisYl_id = IdUtil.getStringId(); + StIvtIostorinvdisYl row = jo.toJavaObject(StIvtIostorinvdisYl.class); + row.setIostorinv_id(mst_id); + row.setIostorinvdtl_id(dtl_id); + row.setIostorinvdtl_id(dtl_id); + row.setIostorinvdis_id(iostorinvdisYl_id); + List list = this.list(new QueryWrapper().eq("iostorinvdtl_id", dtl_id)); + row.setSeq_no(list.size() + 1); + row.setIs_active(true); + row.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); + row.setPlan_qty(row.getPlan_qty()); + // 获取库区信息 + QueryWrapper sect_wrapper = new QueryWrapper<>(); + sect_wrapper.eq("sect_id", row.getSect_id()); + sect_wrapper.eq("is_used", true); + StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper); + if(ObjectUtil.isEmpty(sectDao)) { + throw new BadRequestException("库区不存在或未启用！"); + } + row.setSect_code(sectDao.getSect_code()); + row.setSect_name(sectDao.getSect_name()); + // 获取仓位信息 + QueryWrapper struct_wrapper = new QueryWrapper<>(); + struct_wrapper.eq("struct_id", row.getStruct_id()); + struct_wrapper.eq("is_used", true); + StIvtStructattr structDao = structattrService.getOne(struct_wrapper); + if(ObjectUtil.isEmpty(structDao)) { + throw new BadRequestException("仓位不存在或未启用！"); + } + //查询物料信息 + MaterialbaseDto materialbaseDto = materialbaseService.findById(row.getMaterial_id()); + if(ObjectUtil.isEmpty(materialbaseDto)) { + throw new BadRequestException("物料信息不存在！"); + } + row.setMaterial_code(materialbaseDto.getMaterial_code()); + row.setStruct_code(structDao.getStruct_code()); + row.setStruct_name(structDao.getStruct_name()); + row.setPcsn(DateUtil.today()); + this.save(row); + } + } - @Override - public void create(JSONObject jo, JSONObject mst_jo) { - if (ObjectUtil.isNotEmpty(mst_jo)) { - - String mst_id = mst_jo.getString("mst_id"); - String dtl_id = mst_jo.getString("dtl_id"); - String iostorinvdisYl_id = IdUtil.getStringId(); - StIvtIostorinvdisYl row = jo.toJavaObject(StIvtIostorinvdisYl.class); - row.setIostorinv_id(mst_id); - row.setIostorinvdtl_id(dtl_id); - row.setIostorinvdtl_id(dtl_id); - row.setIostorinvdis_id(iostorinvdisYl_id); - List list = this.list(new QueryWrapper().eq("iostorinvdtl_id", dtl_id)); - row.setSeq_no(list.size() + 1); - row.setIs_active(true); - row.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); - row.setPlan_qty(row.getPlan_qty()); - - // 获取库区信息 - QueryWrapper sect_wrapper = new QueryWrapper<>(); - sect_wrapper.eq("sect_id", row.getSect_id()); - sect_wrapper.eq("is_used", true); - StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper); - if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！"); - - row.setSect_code(sectDao.getSect_code()); - row.setSect_name(sectDao.getSect_name()); - // 获取仓位信息 - QueryWrapper struct_wrapper = new QueryWrapper<>(); - struct_wrapper.eq("struct_id", row.getStruct_id()); - struct_wrapper.eq("is_used", true); - StIvtStructattr structDao = structattrService.getOne(struct_wrapper); - if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！"); - - row.setStruct_code(structDao.getStruct_code()); - row.setStruct_name(structDao.getStruct_name()); - - - - row.setPcsn(DateUtil.today()); - this.save(row); - } - } - - @Override - public void deleteById(String mst_id) { - this.remove(new QueryWrapper().eq("iostorinv_id", mst_id)); - } + @Override + public void deleteById(String mst_id) { + this.remove(new QueryWrapper().eq("iostorinv_id", mst_id)); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java index 4b99b199..ecd93d23 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java @@ -113,5 +113,18 @@ public class StIvtStructivtYl implements Serializable { */ private String workshop_id; + /** + * 物料编号 + */ + private String material_code; + /** + * aps入库时间 + */ + private String aps_instorage_time; + /** + * aps订单种类 + */ + private String aps_sale_type; + } From 532b9003478c1932422e2b3ab09625fbf4216db6 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Tue, 19 Sep 2023 17:55:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?rev:aps=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/aps_insert_sql_0919.sql | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql b/mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql index 9083e831..734500ee 100644 --- a/mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql +++ b/mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql @@ -15,11 +15,14 @@ */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; - ALTER TABLE `pdm_bi_productprocessroute` MODIFY COLUMN `material_id` varchar(25) NULL DEFAULT NULL COMMENT '物料标识'; ALTER TABLE md_me_materialbase ADD COLUMN product_series_name varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '产品系列名称'; +ALTER TABLE st_ivt_iostorinvdis_yl + ADD COLUMN `material_code` varchar(56) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '物料编号'; +ALTER TABLE st_ivt_structivt_yl + MODIFY COLUMN aps_instorage_time timestamp NULL DEFAULT NULL COMMENT 'aps到货时间'; ALTER TABLE mps_sale_order ADD COLUMN rate_qty decimal(18, 3) NULL DEFAULT NULL COMMENT '单重', ADD COLUMN rawmaterial_name varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '原材料信息', @@ -46,11 +49,12 @@ ALTER TABLE pcs_if_purchaseorder ADD COLUMN parent_Id varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '对应父级id', ADD COLUMN show_qty decimal(18, 6) NULL DEFAULT NULL COMMENT '重量', ADD COLUMN rel_sale_code varchar(5000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '原料关联父订单号', - ADD COLUMN semireal_spec varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '对应半成品物料规格'; + ADD COLUMN semireal_spec varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '对应半成品物料规格', + ADD COLUMN aps_instorage_time timestamp NULL DEFAULT NULL COMMENT 'aps到货时间'; ALTER TABLE ql_test_inspectionsheetmst ADD COLUMN material_id varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '物料标识'; DROP TABLE IF EXISTS `pcs_if_demandorder`; -CREATE TABLE `pcs_if_demandorder` ( +CREATE TABLE `pcs_if_demandorder`( `id` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'id', `workshop_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '车间标识', `material_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '物料标识', @@ -38651,6 +38655,18 @@ INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247308239179776', 'A3', 'A3_TK', INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247422554935296', 'A3', 'A3_STLS', '三线三通拉伸', '02', '01', 1, 1, 1, NULL, 1, '管理员', '2023-08-23 15:17:17', NULL, NULL, NULL, NULL); INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247589844750336', 'A3', 'A3_FHQX', '三线发黑清洗', '02', '01', 1, 1, 1, NULL, 1, '管理员', '2023-08-23 15:17:57', NULL, NULL, NULL, NULL); INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247968535875584', 'A3', 'A3_CPQX', '三线成品清洗', '02', '01', 1, 1, 1, NULL, 1, '管理员', '2023-08-23 15:19:27', NULL, NULL, NULL, NULL); - +delete from st_ivt_checkdtl_yl; +delete from st_ivt_checkmst_yl; +delete from st_ivt_iostordaily_yl; +delete from st_ivt_iostorinv_yl; +delete from st_ivt_iostorinvdis_yl; +delete from st_ivt_iostorinvdtl_yl; +delete from st_ivt_moreorlessdtl_yl; +delete from st_ivt_moreorlessmst_yl; +delete from st_ivt_structivt_yl; +delete from st_ivt_structivtflow_yl; +delete from pcs_if_purchaseorder; +INSERT INTO `pcs_if_purchaseorder` VALUES ('1704061432066347008', 'A1', '1684134834211000320', 1369.000000, 0.000000, 0.000000, '16', '个\\只', '2023-09-19', '1322223', '2023-09-19', NULL, 0.000000, '30', '1694303357524643840', '管理员', '2023/09/19 17:14:38', '1694303357524643840', '2023-09-19 17:14:39', '管理员', '0', '2023-09-19 17:17:04', 'EXCEL导入', NULL, NULL, NULL, NULL, 1, '111', '111', '10100046', NULL, '01', NULL, NULL, NULL, NULL, '24024281S', NULL, 100.000000, NULL, 'CCS1 3/8*1 1/8', '2023-09-19 00:00:00'); +INSERT INTO `st_ivt_structivt_yl` VALUES ('1704039949118083072', '1528636861080276992', 'YCL001', '原材料仓位', '1684134834211000320', '01', '2023-09-19', '01', 1, 200.000000, 0.000000, 200.000000, 0.000000, '16', '2023-09-19 15:49:18', '1528627964823080960', 'A1', '10100046', '2023-09-18 15:49:18', 'I'); SET FOREIGN_KEY_CHECKS = 1; From 223f4373380578b20c7fd3b7c0fa756ea70bf9f9 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Tue, 19 Sep 2023 22:02:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?rev:aps=E5=AF=BC=E5=87=BA=E5=88=B0=E5=8E=9F?= =?UTF-8?q?=E6=96=99=E9=9C=80=E6=B1=82=EF=BC=8C=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=92=8C=E5=88=B0=E8=B4=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E4=B8=94=E5=90=8C=E4=B8=80=E5=A4=A9=E7=9A=84?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E6=88=90=E4=B8=80=E4=B8=AA=E5=8E=9F=E6=96=99=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/xml/PcsIfDemandorderMapper.xml | 4 ++-- .../dao/mapper/xml/PcsIfPurchaseorderMapper.xml | 4 ++-- .../impl/PcsIfDemandorderServiceImpl.java | 4 ---- .../impl/PcsIfPurchaseorderServiceImpl.java | 16 ---------------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml index 527d6e43..d85e98ec 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml @@ -38,7 +38,7 @@ ) - order by po.id desc + order by po.ask_time