From 22deece58f2e90c1c97e168c505b2c0433484fd2 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 23 Oct 2023 18:30:38 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=88=86=E6=8B=A3=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E3=80=81=E5=88=86=E6=8B=A3=E6=9C=A8=E6=89=98=E7=9B=98=E6=90=AC?= =?UTF-8?q?=E8=BF=90=E6=A0=A1=E9=AA=8C=E6=A0=B9=E6=8D=AE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 37 ++--- .../wms/ext/mes/service/WmsToMesService.java | 16 +- .../service/dao/mapper/MesRequestMapper.java | 5 + .../service/dao/mapper/MesRequestMapper.xml | 10 ++ .../nl/wms/ext/mes/service/dto/CusterVo.java | 14 ++ .../wms/ext/mes/service/dto/MesOrderInfo.java | 27 +++ .../mes/service/impl/WmsToMesServiceImpl.java | 11 ++ .../controller/PdmBdWorkorderController.java | 12 ++ .../service/IPdmBdWorkorderService.java | 16 ++ .../workorder/service/dao/PdmBdWorkorder.java | 11 ++ .../service/dto/PdmBdWorkorderQuery.java | 1 + .../impl/PdmBdWorkorderServiceImpl.java | 67 +++++++- .../ISchBaseVehiclematerialgroupService.java | 7 + .../SchBaseVehiclematerialgroupMapper.java | 2 + .../SchBaseVehiclematerialgroupMapper.xml | 16 ++ ...chBaseVehiclematerialgroupServiceImpl.java | 5 + .../task_manage/task/tasks/fj/FJMKTask.java | 17 +- .../task_manage/task/tasks/fj/FJQKTask.java | 15 +- .../main/resources/config/application-dev.yml | 2 +- .../wms/pdm/workerorder/ProductionOrder.vue | 143 ++++++++++++++++ .../src/views/wms/pdm/workerorder/index.vue | 155 +++++++++++++++--- .../wms/pdm/workerorder/pdmBdWorkorder.js | 8 +- .../views/wms/sch/group/MaterialDialog.vue | 2 - 23 files changed, 530 insertions(+), 69 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java create mode 100644 lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 1d087ec..25405bd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -302,31 +302,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // todo: 特殊处理 protected int specialHandling(String regionCode, JSONObject param) { - int torus = 0; // 无业务：0， 分拣剩余1托：1，分拣剩余0托：2 + int torus = 0; // 无业务：0，分拣剩余0托：1 if (regionCode.equals("FJ")) { // 判断是否够码满 // 分拣需要在这设置特殊值 // 校验是否够码满一托 - JSONArray array = param.getJSONArray("list"); - List list = JSONArray.parseArray(array.toJSONString(), ApplyDeviceDto.class); - PdmBdWorkorder workorder = workorderService.getDeviceDockingProductionTask(param.getString("device_code")); - // 1 获取点位相应数量 - int sum = 0; - for (ApplyDeviceDto applyDeviceDto : list) { - sum += Integer.parseInt(applyDeviceDto.getQty()); - } - // 2 获取库存量 surplusNumber - int surplusNumber = fjMapper.getInventoryQuantity(workorder.getMaterial_id()); - // 3 现有总数 total - int total = sum + surplusNumber; - // 4 获取木托盘需要多少块 needFullNumber - String needFullNumberStr = fjMapper.getNeedFullNumber(workorder.getMaterial_id()); - int needFullNumber = TaskUtils.convertMultiply(needFullNumberStr); - int surplus = total / needFullNumber; - if (surplus == 1) { - torus = 1; - } else if (surplus == 0) { - torus = 2; - } + boolean enoughCallEmpty = workorderService.isEnoughCallEmpty(param.getString("device_code")); +// PdmBdWorkorder workorder = workorderService.getDeviceDockingProductionTask(param.getString("device_code")); +// BigDecimal realQty = workorder.getReal_qty(); +// BigDecimal planQty = workorder.getPlan_qty(); +// if (realQty.compareTo(planQty) < 0) { // 还可以叫空盘 +// torus = 0; +// } else { +// torus = 1; +// } + return enoughCallEmpty ? 0 : 1; } return torus; } @@ -596,7 +585,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(), baseRequest.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue()); if (ObjectUtil.isEmpty(one)) { - throw new BadRequestException("载具编码为"+baseRequest.getVehicle_code()+"组盘不存在!"); + throw new BadRequestException("载具编码为" + baseRequest.getVehicle_code() + "组盘不存在!"); } String yjDeviceCode = basePoint.getParent_point_code(); // 压机设备编码 SchBasePoint devicePoint = pointService.getById(yjDeviceCode); @@ -627,7 +616,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { vehiclematerialgroupService.updateById(one); // 记录泥料 MesMudConsumptionDto mesMudConsumptionDto = new MesMudConsumptionDto(); - mesMudConsumptionDto.setMSGID(IdUtil.getSnowflake(1,1).nextIdStr()); + mesMudConsumptionDto.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr()); mesMudConsumptionDto.setPWORKSCHE_ID(productionTask.getWorkorder_code()); mesMudConsumptionDto.setOUT_FINNUM(one.getMaterial_weight()); mesMudConsumptionDto.setPRESSUNIT(devicePoint.getExt_point_code()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java index cbea84c..79f3bc2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java @@ -1,8 +1,7 @@ package org.nl.wms.ext.mes.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo; -import org.nl.wms.ext.acs.service.dto.BrickInfoDto; -import org.nl.wms.ext.mes.autotask.AutoSaveWaitGdyInfo; import org.nl.wms.ext.mes.service.dto.*; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; @@ -92,4 +91,17 @@ public interface WmsToMesService { * @param shelfInfo */ void saveShelfInfoBatchToMes(MesShelfInfo shelfInfo); + + /** + * 根据成品物料编码获取订单号 + * @param materialId + * @return + */ + IPage selectPageMesOrder(IPage pages, String materialId); + + /** + * 获取所有客户信息 + * @return + */ + List getCusterInfo(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java index 6eb022a..c24a4ba 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java @@ -2,6 +2,7 @@ package org.nl.wms.ext.mes.service.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.ext.mes.autotask.AutoSaveWaitGdyInfo; @@ -59,4 +60,8 @@ public interface MesRequestMapper { List getAllShelfInfos(); @DS("oracle") void saveShelfInfoBatchToMes(MesShelfInfo shelfInfo); + @DS("oracle") + IPage findOrderInfoByMaterialId(IPage pages, String materialId); + @DS("oracle") + List getCusterInfo(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml index 96a9189..70f0b26 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml @@ -281,4 +281,14 @@ LEFT JOIN sch_base_point p2 ON p2.point_code = vg.source_vehicle_code WHERE p1.region_code = 'GTPHC' + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java new file mode 100644 index 0000000..75ccbb9 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java @@ -0,0 +1,14 @@ +package org.nl.wms.ext.mes.service.dto; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: 客户信息 + * @Date: 2023/10/23 + */ +@Data +public class CusterVo { + private String CUSTER_NO; + private String CUSTER_NAME; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java new file mode 100644 index 0000000..c0028cc --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java @@ -0,0 +1,27 @@ +package org.nl.wms.ext.mes.service.dto; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: mes的订单信息DTO + * @Date: 2023/10/23 + */ +@Data +public class MesOrderInfo { + /** + * 订单号 + */ + private String FORDER_NO; + private String FPLANSTART_DATE; + private String FPLANFINISH_DATE; + private String FMATERIAL_ID; + private String FMATERIAL_NAME; + private String FMATSPEC; + private String FMATMODEL; + private String FSALE_NO; + private int FORDER_SUBNUM; + private String BC; + private String BZ; + private int GUADANSUM; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java index d903334..a706177 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import org.nl.system.service.notice.ISysNoticeService; import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo; @@ -407,6 +408,16 @@ public class WmsToMesServiceImpl implements WmsToMesService { mesRequestMapper.saveShelfInfoBatchToMes(shelfInfo); } + @Override + public IPage selectPageMesOrder(IPage pages, String materialId) { + return mesRequestMapper.findOrderInfoByMaterialId(pages, materialId); + } + + @Override + public List getCusterInfo() { + return mesRequestMapper.getCusterInfo(); + } + /** * 转换 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java index 9725976..0bfa9a1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java @@ -44,6 +44,18 @@ public class PdmBdWorkorderController { public ResponseEntity query(PdmBdWorkorderQuery query, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryAll(query,page)),HttpStatus.OK); } + @GetMapping("/mesOrder") + @Log("查询订单管理") + @ApiOperation("查询订单管理") + public ResponseEntity queryMesOrder(PdmBdWorkorderQuery query, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryMesOrder(query,page)),HttpStatus.OK); + } + @PostMapping("/getCuster") + @Log("获取客户信息") + @ApiOperation("获取客户信息") + public ResponseEntity getCuster(){ + return new ResponseEntity<>(wmsToMesService.getCusterInfo(), HttpStatus.OK); + } @GetMapping("/materials") @Log("查询物料基础信息") diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java index 2edb53e..9c54b8f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java @@ -3,6 +3,7 @@ package org.nl.wms.pdm.workorder.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; +import org.nl.wms.ext.mes.service.dto.MesOrderInfo; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.workorder.service.dto.PdmBdWorkorderQuery; @@ -63,4 +64,19 @@ public interface IPdmBdWorkorderService extends IService { * @return */ PdmBdWorkorder getDeviceDockingProductionTask(String deviceCode); + + /** + * 获取mes订单信息 + * @param query + * @param page + * @return + */ + IPage queryMesOrder(PdmBdWorkorderQuery query, PageQuery page); + + /** + * 根据对接位获取是否可以叫空盘 + * @param deviceCode + * @return + */ + boolean isEnoughCallEmpty(String deviceCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java index c1c6261..16d2a6e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java @@ -146,4 +146,15 @@ public class PdmBdWorkorder implements Serializable { @TableField(exist = false) private String half_material_code; + @TableField(exist = false) + private String order_no; + @TableField(exist = false) + private String custer_no; + @TableField(exist = false) + private int order_subnum; + @TableField(exist = false) + private int guadansum; + @TableField(exist = false) + private String pack_method; + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java index 1171d27..3ca8719 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java @@ -16,5 +16,6 @@ public class PdmBdWorkorderQuery implements Serializable { private String begin_time; private String end_time; private List more_order_status; + private String materialId; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index ce810a2..d42ee7f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,13 +17,15 @@ import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.system.service.notice.ISysNoticeService; import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.ext.acs.service.dto.ResultForAcs; import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; +import org.nl.wms.ext.mes.service.WmsToMesService; +import org.nl.wms.ext.mes.service.dto.MesOrderInfo; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.workorder.service.dao.mapper.PdmBdWorkorderMapper; import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; import org.nl.wms.pdm.workorder.service.dto.PdmBdWorkorderQuery; +import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task_manage.GeneralDefinition; @@ -32,16 +35,16 @@ import org.nl.wms.util.TaskUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-05 + **/ @Slf4j @Service public class PdmBdWorkorderServiceImpl extends ServiceImpl implements IPdmBdWorkorderService { @@ -55,9 +58,13 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl queryAll(PdmBdWorkorderQuery query, PageQuery page){ + public IPage queryAll(PdmBdWorkorderQuery query, PageQuery page) { IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pages = pdmBdWorkorderMapper.selectPageLeftJoin(pages, query); return pages; @@ -78,9 +85,37 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl inventoryCeil ? BigDecimal.valueOf(inventoryCeil) : BigDecimal.valueOf(ceil)); + entity.setExt_data(res.toJSONString()); + } + @Override public void update(PdmBdWorkorder entity) { PdmBdWorkorder dto = pdmBdWorkorderMapper.selectById(entity.getWorkorder_id()); @@ -154,7 +189,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl queryMesOrder(PdmBdWorkorderQuery query, PageQuery page) { + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = wmsToMesService.selectPageMesOrder(pages, query.getMaterialId()); + return pages; + } + + @Override + public boolean isEnoughCallEmpty(String deviceCode) { + PdmBdWorkorder workorder = this.getDeviceDockingProductionTask(deviceCode); + BigDecimal realQty = workorder.getReal_qty(); + BigDecimal planQty = workorder.getPlan_qty(); + // 还可以叫空盘 + return realQty.compareTo(planQty) < 0; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java index 2803a59..b438c31 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java @@ -79,4 +79,11 @@ public interface ISchBaseVehiclematerialgroupService extends IService selectPageLeftJoin(IPage pages, SchBaseVehiclematerialgroupQuery query); SchBaseVehiclematerialgroup getGroup(JSONObject entity); + + int getInventoryQtyByMaterialId(String materialId); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml index 8ccaf69..99d05b7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml @@ -49,4 +49,20 @@ AND vg.group_bind_material_status = '2' + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java index df54f3a..b33a32b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java @@ -129,4 +129,9 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 20bec61..a24eea7 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -37,8 +37,8 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" - @change="crud.toQuery"> - + @change="crud.toQuery" + /> - + - + - + - + + + + + + + + {{ item.CUSTER_NO }} + {{ item.CUSTER_NAME }} + + + - + - + - - + + - - - - - - + + + + + + - + - + @@ -340,17 +402,25 @@ {{ scope.row.is_urgent ? '是' : '否' }} - + - + - + - +