From d9125962b2949f6f1aac2acc0225f3ff4d0ede90 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sat, 24 Jun 2023 19:05:54 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=88=BB=E5=AD=97=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=B4=E6=8A=A4/=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/MdPbBagrecordController.java | 21 -- .../MdPbBucketchangeflowController.java | 21 -- .../MdPbStoragevehicleextController.java | 21 -- .../MdPbStoragevehicleinfoController.java | 90 +++++- .../MdPbStoragevehiclepointController.java | 21 -- .../IMdPbStoragevehicleinfoService.java | 18 ++ .../vehicle/dao/MdPbStoragevehicleext.java | 33 ++- .../vehicle/dao/MdPbStoragevehicleinfo.java | 8 +- .../mapper/MdPbStoragevehicleinfoMapper.java | 3 + .../xml/MdPbStoragevehicleinfoMapper.xml | 6 + .../MdPbStoragevehicleinfoServiceImpl.java | 112 ++++++++ .../rest/StoragevehicleinfoController.java | 85 ------ .../service/StoragevehicleinfoService.java | 6 +- .../service/impl/MaterialbaseServiceImpl.java | 102 +++---- .../impl/StoragevehicleinfoServiceImpl.java | 2 +- .../device/dao/mapper/PdmBiDeviceMapper.xml | 4 + .../workorder/dao/PdmProduceWorkorder.java | 6 +- .../impl/IPdmProduceWorkorderServiceImpl.java | 26 +- .../point/SchBasePointController.java | 6 + .../service/point/ISchBasePointService.java | 1 + .../point/dao/mapper/SchBasePointMapper.java | 2 + .../point/dao/mapper/SchBasePointMapper.xml | 54 ++++ .../point/impl/SchBasePointServiceImpl.java | 19 ++ .../region/impl/SchBaseRegionServiceImpl.java | 4 +- .../impl/StIvtMoreorlessdtlCpServiceImpl.java | 1 - .../src/main/resources/config/application.yml | 2 +- .../device_manage/deviceMaterial/index.vue | 19 +- .../master/storagevehicleinfo/index.vue | 86 +++++- .../storagevehicleinfo}/storagevehicleinfo.js | 16 +- .../product_manage/workorder/AddDialog.vue | 1 + .../wms/product_manage/workorder/index.vue | 12 +- .../staging/kzStaging/ViewDialog.vue | 144 ++++++++++ .../staging/kzStaging/index.vue | 269 ++++++++++++++++++ .../staging/kzStaging/kzStaging.js | 70 +++++ .../staging/kzStaging/备份.vue | 156 ++++++++++ 35 files changed, 1180 insertions(+), 267 deletions(-) delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java rename mes/qd/src/{api/wms/basedata/master => views/wms/masterdata_manage/master/storagevehicleinfo}/storagevehicleinfo.js (62%) create mode 100644 mes/qd/src/views/wms/staging_manage/staging/kzStaging/ViewDialog.vue create mode 100644 mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue create mode 100644 mes/qd/src/views/wms/staging_manage/staging/kzStaging/kzStaging.js create mode 100644 mes/qd/src/views/wms/staging_manage/staging/kzStaging/备份.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java deleted file mode 100644 index 2cb8ec49..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.masterdata_manage.controller.vehicle; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 袋记录表 前端控制器 - *

- * - * @author generator - * @since 2023-05-10 - */ -@RestController -@RequestMapping("/mdPbBagrecord") -public class MdPbBagrecordController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java deleted file mode 100644 index 2c388a1b..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.masterdata_manage.controller.vehicle; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 桶物料变动记录表 前端控制器 - *

- * - * @author generator - * @since 2023-05-10 - */ -@RestController -@RequestMapping("/mdPbBucketchangeflow") -public class MdPbBucketchangeflowController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java deleted file mode 100644 index ccb34354..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.masterdata_manage.controller.vehicle; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 载具扩展属性信息表 前端控制器 - *

- * - * @author generator - * @since 2023-05-10 - */ -@RestController -@RequestMapping("/mdPbStoragevehicleext") -public class MdPbStoragevehicleextController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java index ad545c0a..76eeca89 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java @@ -1,9 +1,22 @@ package org.nl.wms.masterdata_manage.controller.vehicle; -import org.springframework.web.bind.annotation.RequestMapping; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; +import org.nl.wms.masterdata_manage.备份master.service.StoragevehicleinfoService; +import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.storage_manage.productmanage.service.check.dto.CheckQueryMst; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import java.util.Map; /** *

@@ -14,8 +27,79 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/mdPbStoragevehicleinfo") +@RequestMapping("api/storagevehicleinfo") public class MdPbStoragevehicleinfoController { + @Autowired + private StoragevehicleinfoService storagevehicleinfoService; + + @Autowired + private IMdPbStoragevehicleinfoService istoragevehicleinfoService; + + @GetMapping("/query") + public ResponseEntity query(CheckQueryMst query, PageQuery page){ + return null; + } + + @GetMapping("/vehicleInfo") + public ResponseEntity vehicleInfo(String vehicle_code){ + return new ResponseEntity<>(istoragevehicleinfoService.vehileInfo(vehicle_code),HttpStatus.OK); + } + + @GetMapping + @Log("查询载具") + @ApiOperation("查询载具") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(storagevehicleinfoService.queryAll(whereJson,page),HttpStatus.OK); + } + + @PostMapping + @Log("新增载具") + @ApiOperation("新增载具") + public ResponseEntity create(@RequestBody JSONObject map){ + return new ResponseEntity<>(istoragevehicleinfoService.create(map),HttpStatus.CREATED); + } + + @PutMapping + @Log("修改载具") + @ApiOperation("修改载具") + //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") + public ResponseEntity update(@Validated @RequestBody StoragevehicleinfoDto dto){ + storagevehicleinfoService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除载具") + @ApiOperation("删除载具") + //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + storagevehicleinfoService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + @Log("修改点位启用状态") + @ApiOperation("修改点位启用状态") + //@PreAuthorize("@el.check('store:edit')") + public ResponseEntity changeActive(@RequestBody JSONObject json) { + storagevehicleinfoService.changeActive(json); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @GetMapping("/getVehicle/{code}") + @Log("获取起始载具号") + @ApiOperation("获取起始载具号") + //@PreAuthorize("@el.check('store:edit')") + public ResponseEntity getVehicle(@PathVariable String code) { + JSONObject json = storagevehicleinfoService.getVehicle(code); + return new ResponseEntity<>(json,HttpStatus.OK); + } + + @PostMapping("/updateVehicleMaterial") + public ResponseEntity updateVehicleInfo(@RequestBody JSONObject form){ + istoragevehicleinfoService.updateVehicleMaterial(form); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java deleted file mode 100644 index 3c8aade0..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.masterdata_manage.controller.vehicle; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 载具点位对应表 前端控制器 - *

- * - * @author generator - * @since 2023-05-10 - */ -@RestController -@RequestMapping("/mdPbStoragevehiclepoint") -public class MdPbStoragevehiclepointController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java index ab31b342..cc2df164 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java @@ -1,8 +1,12 @@ package org.nl.wms.masterdata_manage.service.vehicle; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Map; + /** *

* 载具信息表 服务类 @@ -13,4 +17,18 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IMdPbStoragevehicleinfoService extends IService { + + /** + * 创建 + * @param map / + */ + JSONArray create(JSONObject map); + /** + * 获取载具上物料信息 + * @param vehile_code + * @return + */ + Map vehileInfo(String vehile_code); + + void updateVehicleMaterial(JSONObject vorm); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java index 3cd90ee2..a2225b97 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java @@ -25,32 +25,32 @@ import lombok.experimental.Accessors; public class MdPbStoragevehicleext implements Serializable { private static final long serialVersionUID = 1L; - /** - * 载具扩展标识 - */ - @TableId - private String storagevehicleext_id; - - /** - * 载具标识 + * 载具编码 */ private String storagevehicle_id; - /** * 载具编码 */ private String storagevehicle_code; - /** - * 载具类型 - */ - private String storagevehicle_type; /** * 物料标识 */ private String material_id; + /** + * 物料标识 + */ + private String material_code; + /** + * 物料标识 + */ + private String material_name; + /** + * 物料标识 + */ + private String material_spec; /** * 批次 @@ -72,6 +72,11 @@ public class MdPbStoragevehicleext implements Serializable { */ private BigDecimal storage_qty; + /** + * 重量 + */ + private BigDecimal weight; + /** * 工艺指令卡 */ @@ -105,7 +110,7 @@ public class MdPbStoragevehicleext implements Serializable { /** * 修改时间 */ - private Date update_time; + private String update_time; /** * 设备标识 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java index acf5c46c..cc9eb4f2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java @@ -68,7 +68,7 @@ public class MdPbStoragevehicleinfo implements Serializable { /** * 创建时间 */ - private Date create_time; + private String create_time; /** * 修改人 @@ -83,12 +83,8 @@ public class MdPbStoragevehicleinfo implements Serializable { /** * 修改时间 */ - private Date update_time; + private String update_time; - /** - * 是否删除 - */ - private Boolean is_delete; /** * 是否启用 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java index e7449ea7..de3924e4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java @@ -3,6 +3,8 @@ package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.Map; + /** *

* 载具信息表 Mapper 接口 @@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface MdPbStoragevehicleinfoMapper extends BaseMapper { + Map vehileInfo(String vehicle_code); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml index 4785cf38..5bbda5e3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml @@ -2,4 +2,10 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java index a1b3d863..6d534bde 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -1,10 +1,33 @@ package org.nl.wms.masterdata_manage.service.vehicle.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; +import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehicleinfoMapper; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.Map; /** *

@@ -17,4 +40,93 @@ import org.springframework.stereotype.Service; @Service public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl implements IMdPbStoragevehicleinfoService { + @Autowired + private MdPbStoragevehicleextServiceImpl storagevehicleextService; + + @Autowired + protected IMdMeMaterialbaseService iMdMeMaterialbaseService; + + @Override + public Map vehileInfo(String vehicle_code) { + if(StringUtils.isEmpty(vehicle_code)){ + return new HashMap(); + } + return this.baseMapper.vehileInfo(vehicle_code); + } + + @Override + public JSONArray create(JSONObject map) { + MdPbStoragevehicleinfo one = this.getOne(new QueryWrapper().eq("storagevehicle_code", map.getString("storagevehicle_code"))); + if (!ObjectUtil.isEmpty(one)) { + throw new BadRequestException("此载具已存在"); + } + String code = ""; + switch (map.getString("storagevehicle_type")) { + case "00": + code = "VEHICCLE_CODE_XMTPT"; + break; + case "01": + code = "VEHICCLE_CODE_CDMTP"; + break; + case "02": + code = "VEHICCLE_CODE_TLD"; + break; + case "03": + code = "VEHICCLE_CODE_TTP"; + break; + case "04": + code = "VEHICCLE_CODE_XMTPC"; + break; + case "05": + code = "VEHICCLE_CODE_LX"; + break; + } + JSONArray resultCodeArr = new JSONArray(); + int num = MapUtil.getInt(map, "num"); + for (int i = 0; i < num; i++) { + MdPbStoragevehicleinfo entity = new MdPbStoragevehicleinfo(); + entity.setStoragevehicle_id(IdUtil.getStringId()); + entity.setStoragevehicle_code(CodeUtil.getNewCode(code)); + entity.setStoragevehicle_name(entity.getStoragevehicle_code()); + entity.setCreate_id(SecurityUtils.getCurrentUserId()); + entity.setCreate_name(SecurityUtils.getCurrentNickName()); + entity.setCreate_time(DateUtil.now()); + entity.setIs_used(map.getString("is_used").equals("1")); + entity.setStoragevehicle_type(map.getString("storagevehicle_type")); + this.save(entity); + resultCodeArr.add(entity.getStoragevehicle_code()); + } + return resultCodeArr; + } + + @Override + @Transactional + public void updateVehicleMaterial(JSONObject vorm) { + Assert.notNull(vorm.getString("storagevehicle_code"),"请求参数载具编号不能为空"); + storagevehicleextService.remove(new QueryWrapper() + .eq("storagevehicle_code",vorm.getString("storagevehicle_code"))); + if (StringUtils.isEmpty(vorm.getString("material_code"))){ + return; + } + MdMeMaterialbase one = iMdMeMaterialbaseService.getOne(new QueryWrapper() + .eq("material_code", vorm.getString("material_code")) + .eq("is_delete",false)); + if (one==null){ + throw new BadRequestException("当前物料编号不存在:"+vorm.getString("material_code")); + } + MdPbStoragevehicleext vehicleMaterial = new MdPbStoragevehicleext(); + vehicleMaterial.setStoragevehicle_id(vorm.getString("storagevehicle_id")); + vehicleMaterial.setStoragevehicle_code(vorm.getString("storagevehicle_code")); + vehicleMaterial.setStorage_qty(vorm.getBigDecimal("storage_qty")); + vehicleMaterial.setWeight(vorm.getBigDecimal("weight")); + vehicleMaterial.setMaterial_id(one.getMaterial_id()); + vehicleMaterial.setMaterial_code(one.getMaterial_code()); + vehicleMaterial.setMaterial_spec(one.getMaterial_spec()); + vehicleMaterial.setQty_unit_id(one.getBase_unit_id()); + vehicleMaterial.setPcsn(vorm.getString("pcsn")); + vehicleMaterial.setUpdate_id(SecurityUtils.getCurrentUserId()); + vehicleMaterial.setUpdate_name(SecurityUtils.getCurrentNickName()); + vehicleMaterial.setUpdate_time(DateUtil.now()); + storagevehicleextService.save(vehicleMaterial); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java deleted file mode 100644 index 0e0c967e..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java +++ /dev/null @@ -1,85 +0,0 @@ - -package org.nl.wms.masterdata_manage.备份master.rest; - - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.masterdata_manage.备份master.service.StoragevehicleinfoService; -import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author ldjun -* @date 2021-12-09 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "载具管理") -@RequestMapping("/api/storagevehicleinfo") -@Slf4j -public class StoragevehicleinfoController { - - private final StoragevehicleinfoService storagevehicleinfoService; - - @GetMapping - @Log("查询载具") - @ApiOperation("查询载具") - //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(storagevehicleinfoService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增载具") - @ApiOperation("新增载具") - //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:add')") - public ResponseEntity create(@RequestBody Map map){ - return new ResponseEntity<>(storagevehicleinfoService.create(map),HttpStatus.CREATED); - } - - @PutMapping - @Log("修改载具") - @ApiOperation("修改载具") - //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") - public ResponseEntity update(@Validated @RequestBody StoragevehicleinfoDto dto){ - storagevehicleinfoService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除载具") - @ApiOperation("删除载具") - //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - storagevehicleinfoService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") - //@PreAuthorize("@el.check('store:edit')") - public ResponseEntity changeActive(@RequestBody JSONObject json) { - storagevehicleinfoService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @GetMapping("/getVehicle/{code}") - @Log("获取起始载具号") - @ApiOperation("获取起始载具号") - //@PreAuthorize("@el.check('store:edit')") - public ResponseEntity getVehicle(@PathVariable String code) { - JSONObject json = storagevehicleinfoService.getVehicle(code); - return new ResponseEntity<>(json,HttpStatus.OK); - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java index 19062144..f43111df 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java @@ -48,9 +48,9 @@ public interface StoragevehicleinfoService { /** * 创建 - * @param map / - */ - JSONArray create(Map map); + * @param map / + */ + JSONArray create(JSONObject map); /** * 编辑 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 cac0be5e..6836575f 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 @@ -8,9 +8,11 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import org.json.XML; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.WebServiceUtil; import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; @@ -18,11 +20,14 @@ import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; +import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService; import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto; import org.nl.wms.pda_manage.pda.dto.MaterialDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +48,8 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ private final ClassstandardService classstandardService; //private final WmsToErpService wmsToErpService; private final RedisUtils redisUtils; + @Autowired + private IMdMeMaterialbaseService materialbaseService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -237,8 +244,8 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ //非必填字段 JSONObject ZfmGetSoResponse = null; try { - //String response = WebServiceUtil.process(url, method, map); - String response = "24026697L软管外丝直接\\C46500\\S3/16*1/4M\\URGJ00124TH2023-03-01KDEALBVGCXKDEALBVGCZ009M2401KG0.01.0KG20X24026697L201200PCNORM201224026697L204000PCNORM24026697L206000PCNORM206024026697L220000PCNORM24026697L201224026697L204024026697L206024026697L220024026697L0000000000077876000000000010S01CHAR300类别美标软管管件X24026697L0000000000077876000000000011S02CHAR300牌号C46500X24026697L0000000000077876000000000012S03CHAR300规格S3/16*1/4MX24026697L0000000000077876000000000014S05CHAR300形状软管外丝直接X24026697L0000000000077876000000000015S06CHAR300标准URGJX24026697L0000000000077876000000000016S07CHAR300图号URGJ00124THX24026697L0000000000077876000000000017S08CHAR300监管性质保税来料X24026697L0000000000077876000000000020S11CHAR300客户牌号(下单时输入)24026697L0000000000077876000000000019S10CHAR300附加说明(下单时输入)24026697L0000000000077876000000000102S13CHAR300铜管内部牌号黄铜管件-黄铜管件24026697LKG1124026697LPC19125024026697L2012101PC1000.024026697S0010PC1000.024026697L2012101PC1000.035000715L9000KG15.1724026697L2060101PC1000.024026697S0010KG15.1724026697L2060101PC1000.035000715L9000KG15.1724026697L2060501PC1.024026697S0010KG15.1724026697L2060501PC1.035000715L9000KG15.17I000共输出1 条物料数据000000"; + String response = WebServiceUtil.process(url, method, map); +// String response = "24026697L软管外丝直接\\C46500\\S3/16*1/4M\\URGJ00124TH2023-03-01KDEALBVGCXKDEALBVGCZ009M2401KG0.01.0KG20X24026697L201200PCNORM201224026697L204000PCNORM24026697L206000PCNORM206024026697L220000PCNORM24026697L201224026697L204024026697L206024026697L220024026697L0000000000077876000000000010S01CHAR300类别美标软管管件X24026697L0000000000077876000000000011S02CHAR300牌号C46500X24026697L0000000000077876000000000012S03CHAR300规格S3/16*1/4MX24026697L0000000000077876000000000014S05CHAR300形状软管外丝直接X24026697L0000000000077876000000000015S06CHAR300标准URGJX24026697L0000000000077876000000000016S07CHAR300图号URGJ00124THX24026697L0000000000077876000000000017S08CHAR300监管性质保税来料X24026697L0000000000077876000000000020S11CHAR300客户牌号(下单时输入)24026697L0000000000077876000000000019S10CHAR300附加说明(下单时输入)24026697L0000000000077876000000000102S13CHAR300铜管内部牌号黄铜管件-黄铜管件24026697LKG1124026697LPC19125024026697L2012101PC1000.024026697S0010PC1000.024026697L2012101PC1000.035000715L9000KG15.1724026697L2060101PC1000.024026697S0010KG15.1724026697L2060101PC1000.035000715L9000KG15.1724026697L2060501PC1.024026697S0010KG15.1724026697L2060501PC1.035000715L9000KG15.17I000共输出1 条物料数据000000"; JSONObject ret = JSONObject.parseObject(XML.toJSONObject(response).toString()); System.out.println("getXML返回数据-----------------" + ret.toString()); JSONObject Envelope = ret.getJSONObject("soap-env:Envelope"); @@ -247,68 +254,67 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ } catch(Exception e) { e.printStackTrace(); + throw new BadRequestException(e.getMessage()); } JSONObject TZtsalesorder = ZfmGetSoResponse.getJSONObject("Out"); JSONObject TMara = TZtsalesorder.getJSONObject("TMara"); - JSONArray rows = TMara.getJSONArray("item"); + Object item = TMara.get("item"); + JSONArray rows= new JSONArray(); + if (item instanceof JSONObject){ + rows.add(item); + }else { + rows = TMara.getJSONArray("item"); + } for(int i = 0; i < rows.size(); i++) { JSONObject row = rows.getJSONObject(i); String Matnr = row.getString("Matnr").replaceAll("^(0+)", ""); //查询是否存在该物料 - JSONObject mater_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + Matnr + "'").uniqueResult(0); - if(ObjectUtil.isEmpty(mater_jo)) { - mater_jo = new JSONObject(); - mater_jo.put("material_id", IdUtil.getSnowflake(1, 1).nextId()); - mater_jo.put("material_code", Matnr); - mater_jo.put("material_name", row.getString("Maktx")); - mater_jo.put("material_model", row.getString("Mtart")); + MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper() + .eq("material_code", Matnr)); + if(ObjectUtil.isEmpty(material)) { + material = new MdMeMaterialbase(); + material.setMaterial_id(org.nl.common.utils.IdUtil.getStringId()); + material.setMaterial_name(row.getString("Maktx")); + material.setMaterial_model(row.getString("Mtart")); + String unit_code = row.getString("Meins"); + JSONObject unit_jo = WQLObject.getWQLObject("md_pb_measureunit").query("unit_name = '" + unit_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(unit_jo)) { + throw new BadRequestException("未查询到该物料对应的单位信息：" + unit_code); + } + material.setBase_unit_id(unit_jo.getString("measure_unit_id")); + + JSONObject class_jo = WQLObject.getWQLObject("md_pb_classstandard").query("class_code = '" + row.getString("Mtart") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(class_jo)) { + throw new BadRequestException("未查询到该物料对应的基础类别信息：" + row.getString("Mtart")); + } + material.setMaterial_type_id(class_jo.getString("class_id")); + material.setCreate_id(SecurityUtils.getCurrentUserId()); + material.setCreate_name(SecurityUtils.getCurrentNickName()); + material.setCreate_time(new Date()); + material.setIs_used(true); + material.setIs_delete(false); + materialbaseService.save(material); + }else{ + material.setMaterial_name(row.getString("Maktx")); + material.setMaterial_model(row.getString("Mtart")); String unit_code = row.getString("Meins"); JSONObject unit_jo = WQLObject.getWQLObject("md_pb_measureunit").query("unit_name = '" + unit_code + "'").uniqueResult(0); if(ObjectUtil.isEmpty(unit_jo)) { throw new BadRequestException("未查询到该物料对应的单位信息：" + unit_code); } - mater_jo.put("base_unit_id", unit_jo.getString("measure_unit_id")); + material.setBase_unit_id(unit_jo.getString("measure_unit_id")); + JSONObject class_jo = WQLObject.getWQLObject("md_pb_classstandard").query("class_code = '" + row.getString("Mtart") + "'").uniqueResult(0); if(ObjectUtil.isEmpty(class_jo)) { throw new BadRequestException("未查询到该物料对应的基础类别信息：" + row.getString("Mtart")); } - mater_jo.put("material_type_id", class_jo.getString("class_id")); - mater_jo.put("create_id", SecurityUtils.getCurrentUserId()); - mater_jo.put("create_name", SecurityUtils.getCurrentNickName()); - mater_jo.put("create_time", DateUtil.now()); - mater_jo.put("update_optid", SecurityUtils.getCurrentUserId()); - mater_jo.put("update_optname", SecurityUtils.getCurrentNickName()); - mater_jo.put("update_time", DateUtil.now()); - mater_jo.put("is_used_time", DateUtil.now()); - mater_jo.put("is_used", "1"); - mater_jo.put("is_delete", "0"); - WQLObject.getWQLObject("md_me_materialbase").insert(mater_jo); - } - else{ - mater_jo.put("material_code", Matnr); - mater_jo.put("material_name", row.getString("Maktx")); - mater_jo.put("material_model", row.getString("Mtart")); - String unit_code = row.getString("Meins"); - JSONObject unit_jo = WQLObject.getWQLObject("md_pb_measureunit").query("unit_name = '" + unit_code + "'").uniqueResult(0); - if(ObjectUtil.isEmpty(unit_jo)) { - throw new BadRequestException("未查询到该物料对应的单位信息：" + unit_code); - } - mater_jo.put("base_unit_id", unit_jo.getString("measure_unit_id")); - JSONObject class_jo = WQLObject.getWQLObject("md_pb_classstandard").query("class_code = '" + row.getString("Mtart") + "'").uniqueResult(0); - if(ObjectUtil.isEmpty(class_jo)) { - throw new BadRequestException("未查询到该物料对应的基础类别信息：" + row.getString("Mtart")); - } - mater_jo.put("material_type_id", class_jo.getString("class_id")); - mater_jo.put("create_id", SecurityUtils.getCurrentUserId()); - mater_jo.put("create_name", SecurityUtils.getCurrentNickName()); - mater_jo.put("create_time", DateUtil.now()); - mater_jo.put("update_optid", SecurityUtils.getCurrentUserId()); - mater_jo.put("update_optname", SecurityUtils.getCurrentNickName()); - mater_jo.put("update_time", DateUtil.now()); - mater_jo.put("is_used_time", DateUtil.now()); - mater_jo.put("is_used", "1"); - mater_jo.put("is_delete", "0"); - WQLObject.getWQLObject("md_me_materialbase").update(mater_jo); + material.setMaterial_type_id(class_jo.getString("class_id")); + material.setCreate_id(SecurityUtils.getCurrentUserId()); + material.setCreate_name(SecurityUtils.getCurrentNickName()); + material.setCreate_time(new Date()); + material.setIs_used(true); + material.setIs_delete(false); + materialbaseService.updateById(material); } } result.put("message", "导入成功！一共导入：" + rows.size() + "条数据！"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java index e9f2a69a..0e47256c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java @@ -84,7 +84,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService @Override @Transactional(rollbackFor = Exception.class) - public JSONArray create(Map map) { + public JSONArray create(JSONObject map) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); JSONObject jsonObject = wo.query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' and is_delete = '0'").uniqueResult(0); if (!ObjectUtil.isEmpty(jsonObject)) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml index a0f7ff91..4e34ec66 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml @@ -13,6 +13,10 @@ and device.workprocedure_id = #{workprocedure_id} + + + and device.product_area = #{product_area} + and device.device_code not in ( select o.device_code as device_code from PDM_produce_workOrder o diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java index 128ff135..07d0b6e8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java @@ -189,7 +189,6 @@ public class PdmProduceWorkorder implements Serializable { private BigDecimal nok_qty; private BigDecimal repare_qty; - /** * 下发人 */ @@ -222,4 +221,9 @@ public class PdmProduceWorkorder implements Serializable { private String confirm_time; + /** + * 是否删除 + */ + private Boolean is_used_fxx = false; + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 71f3702f..c13e3454 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -254,7 +254,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl mdMeMaterialbases = materialspecs.get(workorder.getMaterial_id()); if (!CollectionUtils.isEmpty(mdMeMaterialbases)){ @@ -446,22 +450,22 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl(HttpStatus.NO_CONTENT); } + @GetMapping("/queryVehicle") + @Log("查询刻字点位") + @ApiOperation("查询点位") + public ResponseEntity queryVehicle(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(basePointService.queryVehicle(whereJson,page), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/ISchBasePointService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/ISchBasePointService.java index cdac44b7..c1a8dc30 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/ISchBasePointService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/ISchBasePointService.java @@ -21,6 +21,7 @@ import java.util.Map; public interface ISchBasePointService extends IService { Object queryAll(Map whereJson, PageQuery page); + Object queryVehicle(Map whereJson, PageQuery page); /** * diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java index 9ad86230..3d0f3013 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java @@ -23,6 +23,8 @@ public interface SchBasePointMapper extends BaseMapper { */ List queryAll(Map map); + List queryVehicle(Map map); + /** * 点位管理页面查询 * @param map diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml index ff9356b2..ce043f94 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml @@ -147,4 +147,58 @@ AND sch_base_point.point_code IN ( ${points} ) GROUP BY sch_base_point.point_code + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java index b7ff7137..edf0ad4b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java @@ -14,6 +14,7 @@ import io.jsonwebtoken.lang.Assert; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.enums.StatusEnum; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -84,6 +85,24 @@ public class SchBasePointServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); + page.setOrderBy("point_code asc"); + List list = schBasePointMapper.queryVehicle(whereJson); + list.forEach(a->{ + a.put("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode()); + if (a.get("vehicle_code")!=null){ + a.put("point_status",StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode()); + }; + if (a.get("material_spec")!=null){ + a.put("point_status",StatusEnum.POINT_STATUS_FULL.getCode()); + }; + }); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(page.getTotal()); + return build; + } @Override public Object selectPoint(Map query, PageQuery pageQuery) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java index 33ea146a..c917c24d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/region/impl/SchBaseRegionServiceImpl.java @@ -130,7 +130,7 @@ public class SchBaseRegionServiceImpl extends ServiceImpl() .eq("region_code", region_code) .select("point_status_explain")); - if(ObjectUtil.isEmpty(region.getPoint_status_explain())) { + if(region==null || ObjectUtil.isEmpty(region.getPoint_status_explain())) { return res; } String[] explain = region.getPoint_status_explain().split("，"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java index 4ea55f07..4b70610c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java @@ -93,7 +93,6 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getStoragevehicle_code()) .eq(MdPbStoragevehicleinfo::getIs_used, true) - .eq(MdPbStoragevehicleinfo::getIs_delete, false) ); if (ObjectUtil.isEmpty(vehicleDao)) throw new BadRequestException("载具不存在!"); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 0d141f34..cdab71b2 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue index 3f2205cc..769f3f85 100644 --- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue +++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue @@ -55,7 +55,6 @@ highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" - @current-change="handleCurrentChange" > @@ -85,8 +84,15 @@ + + @@ -96,12 +102,13 @@ import CRUD, { presenter, header, form } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import rrOperation from '@crud/RR.operation' +import MaterDtl from '@/views/wms/pub/MaterDialog' const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null } export default { name: 'SKdevice', - components: { crudOperation, pagination, rrOperation }, + components: { crudOperation, pagination, rrOperation, MaterDtl }, dicts: ['product_area'], cruds() { return [ @@ -111,6 +118,7 @@ export default { mixins: [presenter(), header(), form(defaultForm)], data() { return { + materType: '', materialShow: false, queryTypeOptions: [ { key: 'name', display_name: '字典名称' }, @@ -129,6 +137,13 @@ export default { } }, methods: { + setMaterValue(row) { + this.nowrow.material_id = row.material_id + this.nowrow.material_code = row.material_code + this.nowrow.material_name = row.material_name + this.nowrow.material_spec = row.material_spec + this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新 + }, queryMater(index, row) { this.materialShow = true this.nowindex = index diff --git a/mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue b/mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue index 39675a6d..abe3182d 100644 --- a/mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue @@ -68,6 +68,40 @@ + + + + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ + - + + + + + diff --git a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue new file mode 100644 index 00000000..14242cbe --- /dev/null +++ b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/kzStaging.js b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/kzStaging.js new file mode 100644 index 00000000..fe518fa1 --- /dev/null +++ b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/kzStaging.js @@ -0,0 +1,70 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/point', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/point/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/point', + method: 'put', + data + }) +} +export function findPoints(area_type) { + return request({ + url: 'api/point/area_type/' + area_type + }) +} + +export function changeActive(data) { + return request({ + url: 'api/point/changeActive', + method: 'put', + data + }) +} + +export function getPoint(data) { + return request({ + url: '/api/point/getPoint', + method: 'post', + data + }) +} + +export function getRegion() { + return request({ + url: '/api/point/getRegion', + method: 'get' + }) +} + +export function changeUsed(data) { + return request({ + url: 'api/point/changeUsed', + method: 'post', + data: data + }) +} + +export function vehileInfo(data) { + return request({ + url: 'api/storagevehicleinfo/vehicleInfo?vehicle_code='+data, + method: 'get', + }) +} + +export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, vehileInfo } diff --git a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/备份.vue b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/备份.vue new file mode 100644 index 00000000..8d8609d3 --- /dev/null +++ b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/备份.vue @@ -0,0 +1,156 @@ + + + + +