diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java index 048cfe18..ed28454b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java @@ -1,8 +1,10 @@ package org.nl.wms.masterdata_manage.service.material; import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.storage_manage.pda.service.dto.PdaQuery; import java.util.List; @@ -16,5 +18,5 @@ import java.util.List; */ public interface IMdMeMaterialbaseService extends IService { - List getPdaBcpGetMaterial(JSONObject whereJson); + List getPdaBcpGetMaterial(PdaQuery whereJson, PageQuery pageQuery); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.java index db5153bd..321aaedd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.java @@ -2,7 +2,10 @@ package org.nl.wms.masterdata_manage.service.material.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; +import org.nl.wms.storage_manage.pda.service.dto.PdaQuery; import java.util.List; import java.util.Map; @@ -17,5 +20,5 @@ import java.util.Map; */ public interface MdMeMaterialbaseMapper extends BaseMapper { - List getPdaBcpGetMaterial(JSONObject map); + List getPdaBcpGetMaterial(@Param("query") PdaQuery map, @Param("pageQuery") PageQuery pageQuery); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml index 5bce5642..87010c96 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml @@ -4,16 +4,20 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java index 536ddbcf..b9563a48 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java @@ -2,9 +2,11 @@ package org.nl.wms.masterdata_manage.service.material.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; 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.material.dao.mapper.MdMeMaterialbaseMapper; +import org.nl.wms.storage_manage.pda.service.dto.PdaQuery; import org.springframework.stereotype.Service; import java.util.List; @@ -21,7 +23,7 @@ import java.util.List; public class MdMeMaterialbaseServiceImpl extends ServiceImpl implements IMdMeMaterialbaseService { @Override - public List getPdaBcpGetMaterial(JSONObject whereJson) { - return this.baseMapper.getPdaBcpGetMaterial(whereJson); + public List getPdaBcpGetMaterial(PdaQuery whereJson, PageQuery pageQuery) { + return this.baseMapper.getPdaBcpGetMaterial(whereJson,pageQuery); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java index 38d01ae4..d435c1d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java @@ -17,6 +17,8 @@ public enum PDAEnum { SECT_CODE(MapOf.of("半成品库区", "KQ005")), //库区id SECT_ID(MapOf.of("成品库区", "1528631043496742912")), + //物料类别 + MATERIAL_CLASS(MapOf.of("管件原材料", "1503644349995552768","管件半成品", "1528555443906023424","管件成品", "1528555444031852544")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java index 75adfcf0..eaad000d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java @@ -4,7 +4,9 @@ package org.nl.wms.storage_manage.pda.controller; 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.storage_manage.pda.service.PdaStBcpInService; +import org.nl.wms.storage_manage.pda.service.dto.PdaQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -52,8 +54,8 @@ public class PdaStBcpInController { @PostMapping("/getMaterial") @Log("查询物料") @ApiOperation("查询物料") - public ResponseEntity getMaterial(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(pdaStBcpInService.getMaterial(whereJson), HttpStatus.OK); + public ResponseEntity getMaterial(@RequestBody JSONObject whereJson, PageQuery pageQuery) { + return new ResponseEntity<>(pdaStBcpInService.getMaterial(whereJson,pageQuery), HttpStatus.OK); } @PostMapping("/callVehicle") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java index 1057d0e3..92a5b70c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java @@ -57,8 +57,8 @@ public class PdaStBcpOutController { } @PostMapping("/createIn") - @Log("确认入库") - @ApiOperation("确认入库") + @Log("确认出库") + @ApiOperation("确认出库") public ResponseEntity createIn(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpOutService.createIn(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpInService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpInService.java index ed00c916..53a6254e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpInService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpInService.java @@ -1,6 +1,8 @@ package org.nl.wms.storage_manage.pda.service; import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.pda.service.dto.PdaQuery; /** *

@@ -29,7 +31,7 @@ public interface PdaStBcpInService { * @param whereJson / * @return JSONObject / */ - JSONObject getMaterial(JSONObject whereJson); + JSONObject getMaterial(JSONObject whereJson, PageQuery pageQuery); /** * 查询入库点下拉框 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java new file mode 100644 index 00000000..5b72f50f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java @@ -0,0 +1,25 @@ +package org.nl.wms.storage_manage.pda.service.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.semimanage.service.shutFrame.dao.StIvtShutframeinvBcp; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class PdaQuery extends BaseQuery { + + + private String material_code; + + @Override + public void paramMapping() { + super.doP.put("material_code", QParam.builder().k(new String[]{"material_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java index d762ab20..e0268238 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java @@ -10,6 +10,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.publish.event.PointEvent; @@ -17,6 +21,7 @@ import org.nl.common.utils.IdUtil; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; @@ -25,6 +30,7 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattr import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; @@ -34,16 +40,21 @@ import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.IVTEnum; import org.nl.wms.storage_manage.pda.PDAEnum; import org.nl.wms.storage_manage.pda.service.PdaStBcpInService; +import org.nl.wms.storage_manage.pda.service.dto.PdaQuery; import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; import org.nl.wms.system_manage.service.dict.ISysDictService; import org.nl.wms.system_manage.service.dict.dao.Dict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.function.Consumer; +import java.util.stream.Collectors; /** *

@@ -80,6 +91,9 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { @Autowired private IStIvtIostorinvBcpService iStIvtIostorinvBcpService; // PC半成品入库服务 + @Autowired + private IMdPbClassstandardService iMdPbClassstandardService; // 类别服务 + @Override public JSONObject getBcpStor() { List storList = storattrService.list( @@ -105,8 +119,25 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { } @Override - public JSONObject getMaterial(JSONObject whereJson) { - List list = iMdMeMaterialbaseService.getPdaBcpGetMaterial(whereJson); + public JSONObject getMaterial(JSONObject whereJson1, PageQuery pageQuery) { + PdaQuery whereJson = new PdaQuery(); + whereJson.setMaterial_code(whereJson1.getString("material_code")); + int size = whereJson1.getIntValue("size"); + + // 处理物料分类 list1.size() < size ? list1.size() : size + Set childIdStr = iMdPbClassstandardService.getAllChildIdSet(PDAEnum.MATERIAL_CLASS.code("管件半成品")); + + List list = new ArrayList<>(); + if (ObjectUtil.isEmpty(whereJson1.getString("material_code"))) { + List list1 = iMdMeMaterialbaseService.list( + new QueryWrapper().lambda() + .in(MdMeMaterialbase::getMaterial_type_id, childIdStr) + ); + list = list1.subList(0, Math.min(list1.size(), size)); + } else { + List list1 = iMdMeMaterialbaseService.getPdaBcpGetMaterial(whereJson, pageQuery); + list = list1.subList(0, Math.min(list1.size(), size)); + } JSONObject result = new JSONObject(); result.put("data", JSONArray.parseArray(JSON.toJSONString(list))); @@ -200,7 +231,8 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { @Override @Transactional - public JSONObject createIn(JSONObject whereJson) { + public JSONObject createIn(JSONObject from) { + JSONObject whereJson = from.getJSONObject("from"); // 组织数据 JSONObject param = new JSONObject(); @@ -253,7 +285,7 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { @Override @Transactional public JSONObject confirm(JSONObject whereJson) { - iStIvtIostorinvBcpService.confirm(whereJson); + iStIvtIostorinvBcpService.confirm(whereJson.getJSONObject("row")); JSONObject result = new JSONObject(); result.put("data", ""); @@ -278,6 +310,8 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { structattrService.update( new UpdateWrapper().lambda() .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .set(StIvtStructattr::getIs_emptyvehicle,false) + .set(StIvtStructattr::getStoragevehicle_code,"") .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1()) ); @@ -293,6 +327,8 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { structattrService.update( new UpdateWrapper().lambda() .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .set(StIvtStructattr::getIs_emptyvehicle,false) + .set(StIvtStructattr::getStoragevehicle_code,"") .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1()) ); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java index 100f3cd5..3a2d67c9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpOutServiceImpl.java @@ -120,7 +120,9 @@ public class PdaStBcpOutServiceImpl implements PdaStBcpOutService { @Override @Transactional - public JSONObject createIn(JSONObject whereJson) { + public JSONObject createIn(JSONObject whereJson1) { + JSONObject whereJson = whereJson1.getJSONObject("from"); + // 组织数据 JSONObject param = new JSONObject(); param.put("biz_date", DateUtil.today()); @@ -185,7 +187,8 @@ public class PdaStBcpOutServiceImpl implements PdaStBcpOutService { @Override @Transactional public JSONObject confirm(JSONObject whereJson) { - iStIvtIostorinvBcpOutService.confirm(whereJson); + JSONObject row = whereJson.getJSONObject("row"); + iStIvtIostorinvBcpOutService.confirm(row); JSONObject result = new JSONObject(); result.put("data", ""); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml index 527d6de7..585da349 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml @@ -9,7 +9,7 @@ mater.material_spec, task.task_code, task.task_status, - (dtl.unit_weight * dtl.plan_qty) AS weight_qty + ROUND((dtl.plan_qty * 1000) / dtl.unit_weight,3 ) AS weight_qty FROM st_ivt_iostorinv_bcp dtl LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id @@ -49,7 +49,7 @@ dtl.*, mater.material_code, mater.material_spec, - dtl.plan_qty / dtl.unit_weight AS qty + ROUND((dtl.plan_qty * 1000) / dtl.unit_weight,3) AS qty FROM st_ivt_iostorinv_bcp dtl LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id @@ -63,12 +63,7 @@ and dtl.stor_id = #{stor_id} - - and dtl.create_time <= #{begin_time} - - - and dtl.create_time >= #{end_time} - + and (mater.material_code LIKE '%${material_code}%' or mater.material_name LIKE '%${material_code}%') diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index 81235a8d..ca666bb8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -172,10 +172,12 @@