From 19bade4b5f87f4ca5845f24386f9b820b3e18ad0 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 18 Apr 2025 09:49:09 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=AD=90=E5=8D=B7=E6=AD=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PdmProductSpecController.java | 64 +++++++++++++++++++ .../pdm/productSpec/dao/PdmProductSpec.java | 34 ++++++++++ .../dao/mapper/PdmProductSpecMapper.java | 18 ++++++ .../service/IpdmProductSpecService.java | 26 ++++++++ .../pdm/productSpec/service/SpecRecord.java | 3 + .../impl/PdmProductSpecServiceImpl.java | 62 ++++++++++++++++++ .../PdmBiSubpackagerelationServiceImpl.java | 25 ++------ .../impl/BstIvtPackageinfoivtServiceImpl.java | 3 + .../util/impl/InBussManageServiceImpl.java | 4 ++ .../java/org/nl/common/enums/SpecEnum.java | 30 +++++++++ .../acs/service/impl/AcsToWmsServiceImpl.java | 6 ++ .../mes/service/impl/LmsToMesServiceImpl.java | 16 ++++- .../main/java/org/nl/wms/sch/ComPareUtil.java | 2 + lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 54 +++++++++++++++- .../views/wms/stat/pastivt/pastivtquery.js | 9 ++- 15 files changed, 333 insertions(+), 23 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java new file mode 100644 index 000000000..999eba517 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/controller/PdmProductSpecController.java @@ -0,0 +1,64 @@ +package org.nl.b_lms.pdm.productSpec.controller; + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec; +import org.nl.b_lms.pdm.productSpec.service.IpdmProductSpecService; +import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; +import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; +import org.nl.b_lms.sch.tasks.TwoOutBoxTask; +import org.nl.b_lms.sch.tasks.first_floor_area.auto.AutoSendVehicleToDjq; +import org.nl.b_lms.sch.tasks.first_floor_area.auto.Prun; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.enums.PackageInfoIvtEnum; +import org.nl.common.utils.RedissonUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.logging.annotation.Log; +import org.nl.modules.wql.util.SpringContextHolder; +import org.redisson.api.RLock; +import org.redisson.api.RedissonClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +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; +import java.util.Set; +import java.util.concurrent.TimeUnit; + + +/** + * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)控制层 + * {@code @Author:} gbx + * + * @since 2024-02-01 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/pdmProductSpec") +@Slf4j +public class PdmProductSpecController { + + @Autowired + private IpdmProductSpecService ipdmProductSpecService; + + @GetMapping("/subSpec/{code}") + public ResponseEntity subSpec(@PathVariable String code) { + List result = new ArrayList<>(); + if (!StringUtils.isEmpty(code)){ + result = ipdmProductSpecService.list(new QueryWrapper() + .eq("container_name", code).orderByAsc("id")); + } + return new ResponseEntity<>(result, HttpStatus.OK); + } + +} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java new file mode 100644 index 000000000..fef9d74ea --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/PdmProductSpec.java @@ -0,0 +1,34 @@ +package org.nl.b_lms.pdm.productSpec.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 子卷生产步序表 + */ +@Data +@TableName("pdm_product_spec") +public class PdmProductSpec extends Model { + + @TableId(value = "id") + private Long id; + private String container_name; + private Integer spec; + private String param; + private Boolean result; + private String msg; + private Date create_time; + +} + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java new file mode 100644 index 000000000..8475f7f25 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/dao/mapper/PdmProductSpecMapper.java @@ -0,0 +1,18 @@ +package org.nl.b_lms.pdm.productSpec.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec; + +import java.util.List; +import java.util.Map; + +/** + * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)数据持久层 + * {@code @Author:} gbx + * + * @since 2024-02-01 + */ +public interface PdmProductSpecMapper extends BaseMapper { + + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java new file mode 100644 index 000000000..5a9bfe873 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/IpdmProductSpecService.java @@ -0,0 +1,26 @@ +package org.nl.b_lms.pdm.productSpec.service; + +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.productSpec.dao.PdmProductSpec; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.enums.SpecEnum; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; +import java.util.Set; + + +/** + * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)服务接口层 + * {@code @Author:} gbx + * + * @since 2024-02-01 + */ +public interface IpdmProductSpecService extends IService { + public void record(SpecEnum spec, Map param, Boolean sucess,String msg, List container_name); +} + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java new file mode 100644 index 000000000..e6123029d --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/SpecRecord.java @@ -0,0 +1,3 @@ +package org.nl.b_lms.pdm.productSpec.service; + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java new file mode 100644 index 000000000..a9ba7cb21 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/productSpec/service/impl/PdmProductSpecServiceImpl.java @@ -0,0 +1,62 @@ +package org.nl.b_lms.pdm.productSpec.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.log4j.Log4j; + +import org.nl.b_lms.pdm.productSpec.dao.PdmProductSpec; +import org.nl.b_lms.pdm.productSpec.dao.mapper.PdmProductSpecMapper; +import org.nl.b_lms.pdm.productSpec.service.IpdmProductSpecService; +import org.nl.common.enums.SpecEnum; +import org.nl.modules.wql.util.SpringContextHolder; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + + +/** + * {@code @Description:} 子卷包装关系表(PdmBiSubpackagerelation)服务实现层 + * {@code @Author:} gbx + * + * @since 2024-02-01 + */ +@Service +@Log4j +public class PdmProductSpecServiceImpl extends ServiceImpl implements IpdmProductSpecService { + + + public static void doRecord(SpecEnum spec, Map param, Boolean sucess,String msg, List container_name) { + IpdmProductSpecService service = SpringContextHolder.getBean(IpdmProductSpecService.class); + service.record(spec,param,sucess,msg,container_name); + } + + public static void doRecord(SpecEnum spec, Map param, Boolean sucess,String msg, String container_name) { + IpdmProductSpecService service = SpringContextHolder.getBean(IpdmProductSpecService.class); + List list = new ArrayList<>(); + list.add(container_name); + service.record(spec,param,sucess,msg,list); + } + + @Override + @Async + public void record(SpecEnum spec, Map param, Boolean sucess,String msg, List container_name) { + if (!CollectionUtils.isEmpty(container_name)){ + for (String s : container_name) { + PdmProductSpec productSpec = new PdmProductSpec(); + productSpec.setSpec(spec.getValue()); + productSpec.setContainer_name(s); + productSpec.setResult(sucess); + productSpec.setMsg(msg); + if (!CollectionUtils.isEmpty(param)){ + productSpec.setParam(JSONObject.toJSONString(param)); + } + this.save(productSpec); + } + } + } +} + 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 6af59cd2b..1eabe74dc 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.PdmBiContainerinbound; import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService; import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; +import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl; 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; @@ -48,6 +49,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxMana import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.PackageInfoIvtEnum; +import org.nl.common.enums.SpecEnum; import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -369,6 +371,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl collect = subList.stream().map(PdmBiSubpackagerelation::getPackage_box_sn).collect(Collectors.toSet()); Set containers = subList.stream().map(PdmBiSubpackagerelation::getContainer_name).collect(Collectors.toSet()); + List containerList = subList.stream().map(PdmBiSubpackagerelation::getContainer_name).collect(Collectors.toList()); if (collect.size() == 0){ throw new BadRequestException("当前子卷还未进行装箱组盘操作"); } @@ -455,26 +458,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl { -// try { -// log.debug("----回传子卷包装关系----"); -// String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue(); -// if ("1".equals(isConnect2)) { -// JSONObject param_jo = new JSONObject(); -// param_jo.put("box_no", boxSn); -// param_jo.put("box_weight", subList.get(0).getBox_weight()); -// -// lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo); -// } -// } catch (Exception e) { -// log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + boxSn + ",异常信息：" + e); -// } -// }, pool); -// } } private void checkEntityList(JSONObject whereJson, List packagerelationList) { @@ -549,6 +534,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl { try { log.error("----回传子卷包装关系----"); @@ -796,6 +782,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl tableData = new ArrayList<>(); + List subs = new ArrayList<>(); for (int i = 0; i < subList.size(); i++) { JSONObject json = subList.get(i); LinkedHashMap jsonDtl = new LinkedHashMap<>(); @@ -296,12 +297,15 @@ public class InBussManageServiceImpl implements InBussManageService { jsonDtl.put("quality_scode", IOSEnum.QUALITY_SCODE.code("合格品")); jsonDtl.put("is_active", IOSEnum.IS_SEND.code("是")); tableData.add(jsonDtl); + subs.add(json.getString("container_name")); } String package_box_sn = (String) tableData.get(0).get("package_box_sn"); + try { JSONObject param_jo = new JSONObject(); param_jo.put("box_no", package_box_sn); param_jo.put("box_weight", subList.get(0).getString("box_weight")); + param_jo.put("container_name", subs); lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo); } catch (Exception e) { log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + package_box_sn + ",异常信息：" + e); diff --git a/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java b/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java new file mode 100644 index 000000000..7cb0c5643 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java @@ -0,0 +1,30 @@ +package org.nl.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Author: lyd + * @Description: + * @Date: 2023/5/9 + */ +@Getter +@AllArgsConstructor +public enum SpecEnum { + + FQ(1, "分切",""), + XX(2, "子卷下线",""), + ZJ(3, "质检",""), + BZ(4, "包装",""), + BZ_REMOVE(5, "包装解除",""), + BZ_MES(6, "包装回传","CamstarApi/momBoxPackageSubmit"), + ZXRK(7, "装箱入库",""), + TYCK(8, "退异常口",""), + YX_MES(9, "验箱","CamstarApi/BoxDataCollectionSubmit2"), + RK(10, "入库",""), +; + + private final Integer value; + private final String desc; + private final String url; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 0da6ae6cf..c9d304b19 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -26,6 +26,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproducti import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.pdm.info.dao.PdmBiContainerinbound; import org.nl.b_lms.pdm.info.service.IPdmBiContainerinboundService; +import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; @@ -45,6 +46,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutServi import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.*; import org.nl.common.enums.NoticeTypeEnum; import org.nl.common.enums.PackageInfoIvtEnum; +import org.nl.common.enums.SpecEnum; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.MapOf; import org.nl.modules.common.exception.BadRequestException; @@ -1867,6 +1869,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { try { if (tryLock) { //1.查询满轴缓存位是否有空位 + PdmProductSpecServiceImpl.doRecord(SpecEnum.XX,whereJson,Boolean.TRUE,null,containerName); List bstIvtPackageinfoivtList = packageinfoivtService .list(new LambdaUpdateWrapper().eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用")) .orderByAsc(BstIvtPackageinfoivt::getSort_seq)); @@ -2049,6 +2052,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String box_no = jsonObject.getString("box_no"); Integer box_weight = jsonObject.getIntValue("box_weight"); Integer current_weight = jsonObject.getIntValue("current_weight"); + List containers = jsonObject.getObject("containers", List.class); int count = taskService.count(new QueryWrapper() .eq("point_code1", whereJson.getString("device_code")) @@ -2080,6 +2084,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (CollectionUtils.isEmpty(errorMsg)) { whereJson.put("bill_type", IOSEnum.IN_TYPE.code("生产入库")); inBussManageService.inTask(whereJson); + PdmProductSpecServiceImpl.doRecord(SpecEnum.RK,null,Boolean.TRUE,null,containers); } else { iPdmBiContainerinboundService .update(new UpdateWrapper() @@ -2112,6 +2117,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { TwoExceptionInTask bean = SpringContextHolder.getBean(TwoExceptionInTask.class); bean.createTask(jsonTaskParam); bean.immediateNotifyAcs(null); + PdmProductSpecServiceImpl.doRecord(SpecEnum.TYCK,null,Boolean.FALSE,errorMsg.toString(),containers); } } else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 59dc47ae2..a5dcf3253 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -15,9 +15,11 @@ import lombok.extern.slf4j.Slf4j; import org.checkerframework.checker.units.qual.A; import org.nl.b_lms.pdm.info.dao.PdmBiContainerinfo; import org.nl.b_lms.pdm.info.service.IPdmBiContainerinfoService; +import org.nl.b_lms.pdm.productSpec.service.impl.PdmProductSpecServiceImpl; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; +import org.nl.common.enums.SpecEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; @@ -28,6 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** * LMS系统为客户端，MES为服务端 */ @@ -948,7 +954,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { param.put("QuanlityInBox", num); param.put("BoxWeight", box_weight); param.put("ContainerList", rows); - + List list = new ArrayList<>(); try { String resultMsg = HttpRequest.post(url) .body(String.valueOf(param)) @@ -961,6 +967,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { for (int i = 0; i < array.size(); i++) { JSONObject row = array.getJSONObject(i); String ContainerName = row.getString("ContainerName"); + list.add(ContainerName); String AttributeValue = row.getString("AttributeValue"); subpackagerelationService.update(new LambdaUpdateWrapper().set(PdmBiSubpackagerelation::getNet_weight, AttributeValue).eq(PdmBiSubpackagerelation::getContainer_name, ContainerName)); } @@ -970,11 +977,14 @@ public class LmsToMesServiceImpl implements LmsToMesService { String RTYPE = result.getString("RTYPE"); if ("E".equals(RTYPE)) { + PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.FALSE,result.getString("RTMSG"),list); throw new BadRequestException(result.getString("RTMSG")); } + PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.TRUE,null,list); } catch (Exception e) { + PdmProductSpecServiceImpl.doRecord(SpecEnum.BZ_MES,param,Boolean.FALSE,e.getMessage(),list); throw new BadRequestException("MES提示错误：" + e.getMessage()); } return result; @@ -988,6 +998,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { String box_no = param.getString("box_no"); String box_weight = param.getString("box_weight"); + List containerName = param.getObject("container_name", List.class); if (StrUtil.isEmpty(box_no)) { throw new BadRequestException("木箱号不能为空！"); @@ -1044,11 +1055,14 @@ public class LmsToMesServiceImpl implements LmsToMesService { String RTYPE = result.getString("RTYPE"); if ("E".equals(RTYPE)) { + PdmProductSpecServiceImpl.doRecord(SpecEnum.YX_MES,param,Boolean.FALSE,result.getString("RTMSG"),containerName); throw new BadRequestException("MES提示错误：" +result.getString("RTMSG")); } } catch (Exception e) { + PdmProductSpecServiceImpl.doRecord(SpecEnum.YX_MES,param,Boolean.FALSE,e.getMessage(),containerName); throw new BadRequestException("MES错误：" + e.getMessage()); } + PdmProductSpecServiceImpl.doRecord(SpecEnum.YX_MES,param,Boolean.TRUE,null,containerName); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java index e1f1ddd54..ecc4992d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public class ComPareUtil { @@ -78,6 +79,7 @@ public class ComPareUtil { json.put("box_no", sub.getPackage_box_sn()); json.put("box_weight", sub.getBox_weight().intValue()); json.put("current_weight", new BigDecimal(current_weight).intValue()); + json.put("containers", list.stream().map(a->a.getContainer_name()).collect(Collectors.toList())); json.put("inbound", (pdmBiContainerinbound != null ? pdmBiContainerinbound.getInbound():false)); return json; } diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index 1e83ac555..635657ff3 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -178,6 +178,40 @@ + + + + + + + + + + + + + + + + + + + 取 消 + + + > + + { + if (res){ + this.dtlVisible = true + this.childrenList = res; + } + }) + }, initQuery() { const end = new Date() const start = new Date() diff --git a/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js b/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js index 37698e6eb..b107a4a78 100644 --- a/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js +++ b/lms/nladmin-ui/src/views/wms/stat/pastivt/pastivtquery.js @@ -24,4 +24,11 @@ export function edit(data) { }) } -export default { add, edit, del } +export function subRecord(code) { + return request({ + url: '/api/pdmProductSpec/subSpec/'+code, + method: 'get' + }) +} + +export default { add, edit, del, subRecord }