From 3de0fdbaf83ed62da62bbe27faf9d53a7cfdf0a2 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Wed, 31 Jul 2024 15:21:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E8=A1=A5=E7=A9=BA?= =?UTF-8?q?=E8=BD=BD=E5=85=B7=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/PdmBiSubpackagerelationMapper.xml | 2 +- .../impl/PdmBiSubpackagerelationServiceImpl.java | 4 ++-- .../first_floor_area/auto/AutoSendVehicleToKzj.java | 12 ++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml index 7af1b4e40..1a294bb1c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml @@ -54,7 +54,7 @@ FROM pdm_bi_subpackagerelation WHERE - container_name IN (SELECT container_name FROM bst_ivt_packageinfoivt WHERE point_status = '3' AND ivt_status = '3') + container_name IN (SELECT container_name FROM bst_ivt_packageinfoivt WHERE point_status = '3' AND ivt_status = '3' AND is_used ='1' ) AND sale_order_name LIKE CONCAT('%', #{sale_order_name}, '%') diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 5d4db69fe..c0e311be4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -193,7 +193,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl pdmBiSubpackagerelationList; //请求来源 if (!whereJson.containsKey("type")) { - return Collections.emptyList(); + whereJson.put("type", PackageInfoIvtEnum.REQUEST_SOURCE.code("PC")); } if (whereJson.get("type").toString().equals(PackageInfoIvtEnum.REQUEST_SOURCE.code("PC"))) { //订单号 @@ -273,7 +273,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList()); if (isOutBox.size() > 0) { - throw new BadRequestException("标记为黄色的子卷号已分配且对应的木箱已出库，请重新选择未分配木箱规格的子卷"); + throw new BadRequestException("标记为黄色的子卷号为已分配且对应的木箱已出库，请重新选择未分配木箱规格的子卷"); } JSONArray jsonArray = whereJson.getJSONArray("tableMater"); if (jsonArray == null || jsonArray.size() == 0) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 293e5919f..7a7f8db8d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; -import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; @@ -110,11 +109,16 @@ public class AutoSendVehicleToKzj { } else { return; } - if (existTask.size() % 2 != 0) { - //优先去待检区 + List packageinfoivtList = packageinfoivtService.getBstIvtPackageinfoivts(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), null); + if (packageinfoivtList.size() == 1) { pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); } else { - pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")); + if (existTask.size() % 2 != 0) { + pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")); + } else { + //优先去待检区 + pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); + } } //去待检区或管制区搬运空载具 if (pointCode1 != null) { From 076ef25531cccbf293214f8fcf3b6173c955c3fb Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Wed, 31 Jul 2024 16:11:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue | 4 +++- lms/nladmin-ui/src/views/wms/pdm/sub/index.vue | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue index 3dcdadad3..068e847d6 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue @@ -388,7 +388,9 @@ export default { this.form.checked = row.material_code this.form.sale_order_name = this.saleOrderName await crudPackagerelation.updateEntityList(this.form) - const res = crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.saleOrderName }) + debugger + const queryParam = { sale_order_name: this.saleOrderName, type: '0' } + const res = crudSubpackagerelation.queryContainerization(queryParam) this.openParam = res.content this.clearSelection() this.form.tableMater = [] diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue index b71d61be6..0058368a3 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue @@ -224,6 +224,7 @@ export default { this.crud.toQuery() }, async divOpen() { + debugger this.saleOrderName = this.currentRow.sale_order_name const queryParam = { sale_order_name: this.currentRow.sale_order_name, type: '0' } const res = await crudSubpackagerelation.queryContainerization(queryParam) @@ -231,6 +232,8 @@ export default { // this.divShow = true }, divOpen1() { + debugger + this.saleOrderName = this.currentRow.sale_order_name const queryParam = { sale_order_name: this.currentRow.sale_order_name, type: '0' } crudSubpackagerelation.queryContainerization(queryParam).then(res => { this.openParam = res.content From 91180430486fae2fe40a10bc08dfb130e342fb35 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 31 Jul 2024 18:14:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?add=EF=BC=9A=E4=B8=80=E6=9C=9F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=9A=E9=A3=9E=E9=80=81=E9=80=9A?= =?UTF-8?q?=E7=9F=A5LMS=E6=9C=A8=E7=AE=B1=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/iostorInv/util/wql/BST_INBOX.wql | 1 + .../wms/ext/mes/rest/MesToLmsController.java | 7 ++++ .../wms/ext/mes/service/MesToLmsService.java | 3 +- .../mes/service/impl/MesToLmsServiceImpl.java | 32 +++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index a3c17f1f2..ab206c744 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -238,6 +238,7 @@ WHERE attr.is_used = '1' AND attr.is_delete = '0' + AND attr.lock_type = '1' AND attr.sect_id = 输入.sect_id OPTION 输入.row_in <> "" diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java index 6e26acbc2..c30b5bca2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java @@ -183,4 +183,11 @@ public class MesToLmsController { public ResponseEntity WasteFoilSuccess(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.WasteFoilSuccess(jo), HttpStatus.OK); } + + @PostMapping("/boxIsPass") + @Log("飞书通知LMS木箱是否通过") + @SaIgnore + public ResponseEntity boxIsPass(@RequestBody JSONObject jo) { + return new ResponseEntity<>(mesToLmsService.boxIsPass(jo), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java index 79219ba21..4998f11b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java @@ -84,6 +84,5 @@ public interface MesToLmsService { JSONObject WasteFoilSuccess(JSONObject param); - - + JSONObject boxIsPass(JSONObject jo); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index dc81c0edb..15ebe50d2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -2334,4 +2334,36 @@ public class MesToLmsServiceImpl implements MesToLmsService { return resultParam; } + + @Override + public JSONObject boxIsPass(JSONObject param) { + log.info("boxIsPass输入参数为：-------------------" + param.toString()); + WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); + + JSONObject resultParam = new JSONObject(); + try { + if (ObjectUtil.isEmpty(param.getString("PackageBoxSn"))) { + throw new BadRequestException("木箱号不能为空!"); + } + + if (ObjectUtil.isEmpty(param.getString("IsPss"))) { + throw new BadRequestException("是否通过不能为空!"); + } + // 更新子卷包装关系 + JSONObject json = new JSONObject(); + json.put("is_pass", param.getString("IsPss")); + subTab.update(json,"package_box_sn = '"+param.getString("PackageBoxSn")+"'"); + + resultParam.put("RTYPE", "S"); + resultParam.put("RTMSG", "操作成功!"); + resultParam.put("RTOAL", 1); + resultParam.put("RTDAT", null); + } catch (Exception e) { + resultParam.put("RTYPE", "E"); + resultParam.put("RTMSG", "操作失败!" + e.getMessage()); + resultParam.put("RTOAL", 0); + resultParam.put("RTDAT", null); + } + return resultParam; + } } From 502260e12dfb837ab853cfb81da1980d0edb9d94 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 31 Jul 2024 18:22:06 +0800 Subject: [PATCH 04/10] =?UTF-8?q?rev=EF=BC=9A=E6=89=BE=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E7=9A=84=E7=A9=BA=E6=9C=A8=E7=AE=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/util/wql/BST_INBOX.wql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index ab206c744..e89ddd4a2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -234,11 +234,12 @@ box.box_high FROM st_ivt_structattr attr - LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code AND box.is_packing = '0' + LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code WHERE attr.is_used = '1' AND attr.is_delete = '0' AND attr.lock_type = '1' + AND box.is_packing = '0' AND attr.sect_id = 输入.sect_id OPTION 输入.row_in <> "" From f97bffd478fbba23cc8671f14ec715fb7ea8d7f6 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Wed, 31 Jul 2024 18:34:36 +0800 Subject: [PATCH 05/10] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E8=A3=85=E7=AE=B1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBiSubpackagerelationController.java | 45 +++-- .../mapper/PdmBiSubpackagerelationMapper.java | 3 +- .../mapper/PdmBiSubpackagerelationMapper.xml | 2 +- .../dto/PdmBiSubpackagerelationDto.java | 155 ++---------------- .../IpdmBiSubpackagerelationService.java | 3 +- .../PdmBiSubpackagerelationServiceImpl.java | 25 +-- 6 files changed, 68 insertions(+), 165 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java index e9b2d2d45..1f0c0eed6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java @@ -1,24 +1,25 @@ package org.nl.b_lms.pdm.subpackagerelation.controller; -import java.util.Set; -import java.util.Map; - import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; -import org.nl.common.TableDataInfo; -import org.springframework.data.domain.Pageable; -import org.springframework.web.bind.annotation.*; import lombok.RequiredArgsConstructor; - -import javax.annotation.Resource; - import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; +import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; +import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.modules.logging.annotation.Log; +import org.redisson.api.RLock; +import org.redisson.api.RedissonClient; +import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.nl.modules.logging.annotation.Log; -import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; /** @@ -33,6 +34,8 @@ import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationServi @Slf4j public class PdmBiSubpackagerelationController { + @Resource + private RedissonClient redissonClient; @Resource private IpdmBiSubpackagerelationService pdmBiSubpackagerelationService; @@ -52,6 +55,7 @@ public class PdmBiSubpackagerelationController { @GetMapping("/queryBoxSpec") + @SaIgnore @Log("查询待检区木箱规格") public ResponseEntity queryBoxSpec(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(pdmBiSubpackagerelationService.queryBoxSpec(whereJson, page), HttpStatus.OK); @@ -117,7 +121,22 @@ public class PdmBiSubpackagerelationController { @Log("子卷装箱") //@SaCheckPermission("@el.check(updateEntityList)") public ResponseEntity updateEntityList(@RequestBody JSONObject whereJson) { - pdmBiSubpackagerelationService.updateEntityList(whereJson); + RLock lock = redissonClient.getLock("updateEntityList"); + boolean tryLock = false; + try { + tryLock = lock.tryLock(0, TimeUnit.SECONDS); + if (tryLock) { + pdmBiSubpackagerelationService.updateEntityList(whereJson); + } else { + log.info("子卷装箱操作正在执行被锁住。"); + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + if (tryLock) { + lock.unlock(); + } + } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java index 19caaead7..982f65cb1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto; import org.nl.common.domain.query.PageQuery; @@ -28,6 +29,6 @@ public interface PdmBiSubpackagerelationMapper extends BaseMapper queryContainerNameBySaleOrder( @Param("sale_order_name") String sale_order_name,@Param("container_name") String container_name); + List queryContainerNameBySaleOrder(@Param("sale_order_name") String sale_order_name, @Param("container_name") String container_name); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml index 1a294bb1c..ab0db12e8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml @@ -72,7 +72,7 @@ ORDER BY MAX(create_time) DESC - SELECT a.*, b.*, (CASE diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java index 988bb5607..f9e901996 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java @@ -1,11 +1,11 @@ package org.nl.b_lms.pdm.subpackagerelation.dto; -import java.math.BigDecimal; -import java.io.Serializable; - -import lombok.*; -import lombok.Data; import lombok.Builder; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.math.BigDecimal; /** @@ -35,10 +35,7 @@ public class PdmBiSubpackagerelationDto implements Serializable { * 木箱自身重量 */ private BigDecimal box_weight; - /** - * 保质期 - */ - private String quality_guaran_period; + /** * 销售订单及行号 */ @@ -51,90 +48,16 @@ public class PdmBiSubpackagerelationDto implements Serializable { * 客户名称 */ private String customer_description; - /** - * 产品编码 - */ - private String product_name; - /** - * 产品描述 - */ - private String product_description; - /** - * 入库日期 - */ - private String date_of_FG_inbound; + /** * 子卷号 */ private String container_name; - /** - * 产品规格(幅宽) - */ - private String width; - /** - * 产品厚度 - */ - private String thickness; - /** - * 单位面积质量 - */ - private BigDecimal mass_per_unit_area; - /** - * 净重 - */ - private BigDecimal net_weight; - /** - * 长度 - */ - private BigDecimal length; - /** - * 制造完成日期 - */ - private String date_of_production; - /** - * 计划外分切的子卷 - */ - private String is_un_plan_production; - /** - * 子卷的物性值1 - */ - private String un_plan_product_property1; - /** - * 子卷的物性值2 - */ - private String un_plan_product_property2; - /** - * 子卷的物性值3 - */ - private String un_plan_product_property3; - /** - * 备注 - */ - private String remark; - /** - * 创建人 - */ - private Long create_id; - /** - * 创建人姓名 - */ - private String create_name; - /** - * 创建时间 - */ - private String create_time; /** * 状态 */ private String status; - /** - * 是否需要重打外包装标签 - */ - private String isRePrintPackageBoxLabel; - /** - * 是否需要拆包重打子卷标签 - */ - private String isUnPackBox; + /** * 木箱料号 */ @@ -143,66 +66,24 @@ public class PdmBiSubpackagerelationDto implements Serializable { * SAP批次 */ private String sap_pcsn; + + /** - * 交货单号 + * 木箱组 */ - private String vbeln; + private String box_group; /** - * 交货单行号 + * 子卷规格 */ - private String posnr; + private String paper_tube_description; /** - * 木箱长度 + * 纸管重量 */ - private String box_length; + private String paper_weight; /** - * 木箱宽度 + * 子卷重量 */ - private String box_width; - /** - * 木箱高度 - */ - private String box_high; - /** - * 销售订单描述 - */ - private String sale_order_description; - /** - * 客户要求规格幅宽 - */ - private String width_standard; - /** - * 物料标准厚度 - */ - private String thickness_request; - /** - * 实际木箱自身重量 - */ - private BigDecimal real_weight; - /** - * 包装关系类型 - */ - private String sub_type; - /** - * 客户需求抗拉下限 - */ - private String demand_limit; - /** - * 内控标准抗拉下限 - */ - private String standard_limit; - /** - * 生产实际抗拉值 - */ - private String actual_value; - /** - * 解绑删除标识 - */ - private String need_delete; - /** - * 储存地点 - */ - private String ext_code; + private String weight; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java index 4049b762e..9cc002ac8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; +import org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto; import org.nl.common.domain.query.PageQuery; import org.springframework.data.domain.Pageable; @@ -58,7 +59,7 @@ public interface IpdmBiSubpackagerelationService extends IService */ - List queryContainerNameBySaleOrder(Map whereJson); + List queryContainerNameBySaleOrder(Map whereJson); /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index c0e311be4..79620aa2a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -25,6 +25,7 @@ import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper; +import org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto; import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper; @@ -189,8 +190,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl queryContainerNameBySaleOrder(Map whereJson) { - List pdmBiSubpackagerelationList; + public List queryContainerNameBySaleOrder(Map whereJson) { + List pdmBiSubpackagerelationList; //请求来源 if (!whereJson.containsKey("type")) { whereJson.put("type", PackageInfoIvtEnum.REQUEST_SOURCE.code("PC")); @@ -210,7 +211,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl countByGroup = pdmBiSubpackagerelationList.stream() .filter(item -> item.getBox_group() != null) - .collect(Collectors.groupingBy(PdmBiSubpackagerelation::getBox_group, Collectors.counting())); + .collect(Collectors.groupingBy(PdmBiSubpackagerelationDto::getBox_group, Collectors.counting())); pdmBiSubpackagerelationList.forEach(r -> { //获取子卷长度 // int containerLength = getMaxNum(null, r.getPaper_tube_description()); @@ -271,7 +272,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl isOutBox = packagerelationList.stream().filter(r -> r.getStatus().equals("0")).collect(Collectors.toList()); + List isOutBox = packagerelationList.stream().filter(r -> !r.getStatus().equals("99")).collect(Collectors.toList()); if (isOutBox.size() > 0) { throw new BadRequestException("标记为黄色的子卷号为已分配且对应的木箱已出库，请重新选择未分配木箱规格的子卷"); } @@ -307,7 +308,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper().in(PdmBiSlittingproductionplan::getContainer_name, containerNameList)); if (CollectionUtils.isEmpty(planList)) { - throw new BadRequestException("需要装箱的子卷号不存在分切计划"); + throw new BadRequestException("存在查询不到分切计划的子卷号"); } BigDecimal totalWeight; totalWeight = planList.stream() @@ -319,7 +320,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl workIdList, Set containerNameList, String deviceCode, Integer maxBoxGroup, String boxType, BigDecimal totalWeight) { + private void outBox(List workIdList, Set containerNameList, String deviceCode, Integer maxBoxGroup, JSONObject whereJson, BigDecimal totalWeight) { JSONObject boxInfo = new JSONObject(); //确定装箱区终点 boxInfo.put("device_code", deviceCode); - boxInfo.put("material_code", boxType); + boxInfo.put("material_code",whereJson.getString("checked")); boxInfo.put("num", workIdList.size()); String boxSn = outBoxManageService.outBox(boxInfo); BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( @@ -397,13 +398,11 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl { try { - updateBoxGroup(maxBoxGroup, workIdList, boxSn, boxType, weightTotal); + updateBoxGroup(maxBoxGroup, workIdList, boxSn, whereJson.getString("checked"), weightTotal); } catch (Exception e) { log.error("子卷装箱异常，更新子卷包装关系异常：" + e); } @@ -411,7 +410,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl { try { - transferBoxPackageToMes(true, null, containerNameList, boxSn, weightTotal); + transferBoxPackageToMes(false, whereJson, containerNameList, boxSn, weightTotal); } catch (Exception e) { log.error("子卷装箱异常，给MES传输子卷包装关系异常：" + e); } @@ -424,6 +423,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl装箱区agv确定起点任务创建异常：" + e); } }, pool); + + } /** From eb085ca09310435581edf2f664f9329983bcfda8 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Wed, 31 Jul 2024 18:53:02 +0800 Subject: [PATCH 06/10] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E8=A3=85=E7=AE=B1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java | 1 + .../service/impl/PdmBiSubpackagerelationServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java index f9e901996..a5d4a978b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dto/PdmBiSubpackagerelationDto.java @@ -62,6 +62,7 @@ public class PdmBiSubpackagerelationDto implements Serializable { * 木箱料号 */ private String box_type; + /** * SAP批次 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 79620aa2a..b4bf5cb85 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -225,6 +225,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl Date: Thu, 1 Aug 2024 09:15:22 +0800 Subject: [PATCH 07/10] =?UTF-8?q?rev=EF=BC=9A=E5=85=A5=E5=BA=93=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E6=89=98=E7=9B=98?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java index 03e53b16e..5c92626d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java @@ -50,7 +50,7 @@ public class TwoExceptionInTask extends AbstractAcsTask { .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) .next_device_code(json.getString("point_code2")) - .vehicle_code(json.getString("vehicle_code")) + .vehicle_code(json.getString("vehicle_code2")) .interaction_json(json.getJSONObject("request_param")) .priority(json.getString("priority")) .class_type(json.getString("task_type")) From c09c67e44448a20112c7eb9b0d6932c6f05a931b Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 1 Aug 2024 10:01:03 +0800 Subject: [PATCH 08/10] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8D=B7?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PdmBiSubpackagerelationMapper.xml | 17 ++++++++++++++++- .../PdmBiSubpackagerelationServiceImpl.java | 9 ++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml index ab0db12e8..c7e67bae2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml @@ -74,7 +74,22 @@ diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index 41a5c65ed..a8ed3583e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -220,6 +220,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl Date: Thu, 1 Aug 2024 14:26:30 +0800 Subject: [PATCH 10/10] =?UTF-8?q?opt:=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8D=B7?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue index 068e847d6..e149be912 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue @@ -401,9 +401,15 @@ export default { debugger if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) { debugger + const weightList = this.currentSelection.filter(item => item.weight === '0' || item.weight === null) + if (weightList.length > 0) { + this.crud.notify('该子卷重量不能为空，请检查子卷的分切计划信息！', CRUD.NOTIFICATION_TYPE.WARNING) + return + } const descriptionList = this.currentSelection.filter(item => item.paper_tube_description !== null && item.paper_tube_description !== '') if (descriptionList.length === 0) { this.crud.notify('未查询到该子卷的规格信息，请检查子卷的分切计划信息！', CRUD.NOTIFICATION_TYPE.WARNING) + return } const paper_tube_description = descriptionList[0].paper_tube_description const descriptionsAreSame = this.currentSelection.every(item => item.paper_tube_description === paper_tube_description)