diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java index 9a1a897..d54cc6b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java @@ -1,6 +1,7 @@ package org.nl.wms.ext_manage.controller; import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext_manage.service.AcsToWmsService; @@ -34,4 +35,11 @@ public class AcsToWmsController { return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); } + @PostMapping("/apply") + @Log("ACS向LMS申请任务") + @SaIgnore + public ResponseEntity apply(@RequestBody JSONObject param) { + return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java index e80e0fe..bab0997 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java @@ -39,13 +39,6 @@ public class ErpToWmsController { return new ResponseEntity<>(erpToWmsService.erpQueryIvt(whereJson),HttpStatus.OK); } - @PostMapping("/task") - @Log("下发出库单据") - @SaIgnore - public ResponseEntity sendTask(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(erpToWmsService.sendTask(whereJson),HttpStatus.OK); - } - @PostMapping("/groupplate") @Log("下发组盘信息") @SaIgnore diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java index e198180..22ca73d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java @@ -1,5 +1,7 @@ package org.nl.wms.ext_manage.service; +import com.alibaba.fastjson.JSONObject; + import java.util.Map; /** @@ -20,4 +22,7 @@ public interface AcsToWmsService { * @return Map */ Map receiveTaskStatusAcs(String string); + + /** ACS请求接口 */ + Map acsApply(JSONObject param); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java index b51f953..864aeec 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java @@ -25,38 +25,17 @@ public interface ErpToWmsService { ErpResponse erpQueryIvt(JSONObject whereJson); /** - * 下发出库单据 + * 下发组盘单据 * @param whereJson： { - * stor_code：仓库编码 - * inv_code：单据号（可为空） - * task_type ：业务类型（可为空） * data : [ * { * mater_code：物料编码 - * batch_no：批次号（可为空） + * vehicle_code：托盘号 + * vehicle_code2：料框号 * quantity：数量 * unit_code：计量单位 - * unit_name：计量单位名称 - * } - * ] - * } - * @return ErpResponse - */ - ErpResponse sendTask(JSONObject whereJson); - - /** - * 下发出库单据 - * @param whereJson： { - * stor_code：仓库编码 - * inv_code：单据号（可为空） - * task_type ：业务类型（可为空） - * data : [ - * { - * mater_code：物料编码 - * batch_no：批次号（可为空） - * quantity：数量 - * unit_code：计量单位 - * unit_name：计量单位名称 + * ext_code：单据号 + * ext_type：单据类型 * } * ] * } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java index 5eac0b0..4e16342 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java @@ -1,17 +1,25 @@ package org.nl.wms.ext_manage.service.impl; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.wms.ext_manage.enums.ResultAcsStatus; import org.nl.wms.ext_manage.service.AcsToWmsService; +import org.nl.wms.pm_manage.service.dao.PmFormData; +import org.nl.wms.pm_manage.service.dao.mapper.PmFormDataMapper; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.util.AbstractTask; import org.nl.wms.sch_manage.service.util.TaskFactory; +import org.nl.wms.warehouse_manage.enums.IOSEnum; +import org.nl.wms.warehouse_manage.service.dao.GroupPlate; +import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +27,8 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -39,13 +49,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { */ @Autowired private RedissonClient redissonClient; - /* * 任务服务 */ @Autowired private ISchBaseTaskService iSchBaseTaskService; + @Resource + private PmFormDataMapper pmFormDataMapper; /** * 任务工厂服务 */ @@ -103,4 +114,65 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("acs向lms反馈任务状态，返回参数：--------------------------------------" + result.toString()); return result; } + + @Override + @SneakyThrows + public Map acsApply(JSONObject param) { + JSONObject result = new JSONObject(); + param.put("user_id", "3"); + param.put("person_name","ACS"); + try { + result = this.applyInTask(param); + } catch (Exception e) { + log.error("ACS请求LMS出现错误: {}{}", e,e.getMessage()); + result.put("status", HttpStatus.BAD_REQUEST.value()); + result.put("message", "申请任务失败!"); + } + return result; + } + + /** + * 申请入库任务 + * + * @param param + * @throws BadRequestException + */ + public JSONObject applyInTask(JSONObject param) throws BadRequestException { + JSONObject result = new JSONObject(); + log.info("ACS请求apply参数: {}", param); + // 申请任务 + SchBaseTask task = new SchBaseTask(); // 任务实体 + //起点 + String device_code = param.getString("device_code"); // 请求点 + String vehicle_code = param.getString("vehicle_code");//子托盘 + if(ObjectUtil.isNotEmpty(vehicle_code)) { + vehicle_code = vehicle_code.trim(); + } + //子托盘非空 + if(ObjectUtil.isNotEmpty(vehicle_code)) { + Assert.isFalse(vehicle_code.contains(";"), + "该任务申请托盘["+vehicle_code+"]存在串读，无法申请任务!"); + }else{ + Assert.isFalse(ObjectUtil.isEmpty(vehicle_code), + "该任务申请托盘["+vehicle_code+"]为空，无法申请任务!"); + } + //判断该子托盘是否存在未完成任务 + Integer sub_tray_lists = iSchBaseTaskService.findUnFinishTasksBySub_tray(vehicle_code); + Assert.isFalse(sub_tray_lists>0, + "该任务申请托盘["+vehicle_code+"]已存在未完成的任务，无法申请任务!"); + + //校验组盘单据信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PmFormData::getVehicle_code,vehicle_code); + wrapper.eq(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("生成")); + List list = pmFormDataMapper.selectList(wrapper); + Assert.isFalse(list.size()<=0, "该任务申请托盘["+vehicle_code+"]异常，无入库组盘单据信息!"); + + + //todo 查询组盘数据，生成入库单，自动分配，生成任务 + //String task_code =taskService.create(task); + //result.put("task_code",task_code); + return result; + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java index 67098a6..3e29e05 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java @@ -1,11 +1,11 @@ package org.nl.wms.ext_manage.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.json.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; import org.nl.wms.basedata_manage.service.IBsrealStorattrService; import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService; @@ -15,11 +15,17 @@ import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper; import org.nl.wms.ext_manage.service.ErpToWmsService; import org.nl.wms.ext_manage.service.util.ErpResponse; +import org.nl.wms.pm_manage.service.IPmFormDataService; +import org.nl.wms.pm_manage.service.dao.PmFormData; import org.nl.wms.warehouse_manage.enums.IOSEnum; +import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; import org.nl.wms.warehouse_manage.service.IOutBillService; +import org.nl.wms.warehouse_manage.service.dao.GroupPlate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -41,6 +47,11 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { @Autowired private IBsrealStorattrService iBsrealStorattrService; + @Autowired + private IPmFormDataService iPmFormDataService; + @Autowired + private IMdPbGroupplateService iMdPbGroupplateService; + /** * 物料基础数据服务 */ @@ -73,82 +84,14 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { return erpResponse; } - @Override - public ErpResponse sendTask(JSONObject whereJson) { - log.info("sendTask下发出库任务接口输入参数为：-------------------" + whereJson.toString()); - // 组织主表数据 - JSONObject jsonMst = new JSONObject(); - jsonMst.put("biz_date", DateUtil.now()); - jsonMst.put("bill_status", IOSEnum.BILL_STATUS.code("生成")); - jsonMst.put("source_id", whereJson.getString("inv_code")); - jsonMst.put("source_type", whereJson.getString("task_type")); - jsonMst.put("bill_type", whereJson.getString("task_type")); - jsonMst.put("user", "erp"); - // 查询仓库 - BsrealStorattr storDao = iBsrealStorattrService.findByCode(whereJson.getString("stor_code")); - if (storDao == null) { - throw new BadRequestException("仓库不存在"); - } - jsonMst.put("stor_id", storDao.getStor_id()); - // 组织明细 - List dataList = whereJson.getJSONArray("data").toJavaList(JSONObject.class); - // 查询所有物料 - List materDaoList = iMdMeMaterialbaseService.list( - new QueryWrapper().lambda() - .in(MdMeMaterialbase::getMaterial_code, dataList.stream() - .map(row -> row.getString("mater_code")) - .collect(Collectors.toList()) - ) - ); - // 查询所有计量单位 - List unitDaoList = iMdPbMeasureunitService.list( - new QueryWrapper().lambda() - .in(MdPbMeasureunit::getUnit_code, dataList.stream() - .map(row -> row.getString("unit_code")) - .collect(Collectors.toList())) - ); - // 明细集合 - JSONArray dtlArr = new JSONArray(); - for (JSONObject json : dataList) { - JSONObject jsonDtl = new JSONObject(); - MdMeMaterialbase materDao = materDaoList.stream() - .filter(row -> row.getMaterial_code().equals(json.getString("mater_code"))) - .findFirst().orElse(null); - jsonDtl.put("material_id", materDao.getMaterial_id()); - jsonDtl.put("pcsn", json.getString("batch_no")); - MdPbMeasureunit unitDao = unitDaoList.stream() - .filter(row -> row.getUnit_code().equals(json.getString("unit_code"))) - .findFirst().orElse(null); - jsonDtl.put("qty_unit_id", unitDao.getMeasure_unit_id()); - jsonDtl.put("qty_unit_name", unitDao.getUnit_name()); - jsonDtl.put("qty", json.getString("quantity")); - dtlArr.add(jsonDtl); - } - jsonMst.put("tableData",dtlArr); - // 调用出库单新增服务 - iOutBillService.insertDtl(jsonMst); - - log.info("sendTask下发出库任务接口输出参数为：-------------------" + ErpResponse.requestOk().toString()); - return ErpResponse.requestOk(); - } - @Override public ErpResponse sendGroupplate(JSONObject whereJson) { - log.info("sendTask下发出库任务接口输入参数为：-------------------" + whereJson.toString()); - // 组织主表数据 - JSONObject jsonMst = new JSONObject(); - jsonMst.put("biz_date", DateUtil.now()); - jsonMst.put("bill_status", IOSEnum.BILL_STATUS.code("生成")); - jsonMst.put("source_id", whereJson.getString("inv_code")); - jsonMst.put("source_type", whereJson.getString("task_type")); - jsonMst.put("bill_type", whereJson.getString("task_type")); - jsonMst.put("user", "erp"); + log.info("sendGroupplate下发组盘接口输入参数为：-------------------" + whereJson.toString()); // 查询仓库 - BsrealStorattr storDao = iBsrealStorattrService.findByCode(whereJson.getString("stor_code")); + BsrealStorattr storDao = iBsrealStorattrService.findByCode("GW"); if (storDao == null) { throw new BadRequestException("仓库不存在"); } - jsonMst.put("stor_id", storDao.getStor_id()); // 组织明细 List dataList = whereJson.getJSONArray("data").toJavaList(JSONObject.class); // 查询所有物料 @@ -167,27 +110,56 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { .collect(Collectors.toList())) ); // 明细集合 - JSONArray dtlArr = new JSONArray(); + List dtlArr = new ArrayList<>(); + // 明细集合 + List plates = new ArrayList<>(); for (JSONObject json : dataList) { - JSONObject jsonDtl = new JSONObject(); + PmFormData jsonDtl = new PmFormData(); MdMeMaterialbase materDao = materDaoList.stream() .filter(row -> row.getMaterial_code().equals(json.getString("mater_code"))) .findFirst().orElse(null); - jsonDtl.put("material_id", materDao.getMaterial_id()); - jsonDtl.put("pcsn", json.getString("batch_no")); + jsonDtl.setId(IdUtil.getStringId()); + jsonDtl.setCode(json.getString("ext_code")); + jsonDtl.setStatus(IOSEnum.BILL_STATUS.code("生成")); + jsonDtl.setStor_id(storDao.getStor_id()); + jsonDtl.setStor_name(storDao.getStor_name()); + jsonDtl.setForm_type(json.getString("ext_type")); + jsonDtl.setSource_form_date(DateUtil.today()); + jsonDtl.setMaterial_code(json.getString("mater_code")); + jsonDtl.setMaterial_id(materDao.getMaterial_id()); + jsonDtl.setQty(BigDecimal.valueOf(json.getDoubleValue("quantity"))); + jsonDtl.setPlan_qty(BigDecimal.valueOf(json.getDoubleValue("quantity"))); MdPbMeasureunit unitDao = unitDaoList.stream() .filter(row -> row.getUnit_code().equals(json.getString("unit_code"))) .findFirst().orElse(null); - jsonDtl.put("qty_unit_id", unitDao.getMeasure_unit_id()); - jsonDtl.put("qty_unit_name", unitDao.getUnit_name()); - jsonDtl.put("qty", json.getString("quantity")); + jsonDtl.setUnit_id(unitDao.getMeasure_unit_id()); + jsonDtl.setUnit_name(unitDao.getUnit_name()); + jsonDtl.setVehicle_code(json.getString("vehicle_code")); + jsonDtl.setVehicle_code2(json.getString("vehicle_code2")); + jsonDtl.setCreate_name("ERP"); + jsonDtl.setCreate_time(DateUtil.now()); dtlArr.add(jsonDtl); - } - jsonMst.put("tableData",dtlArr); - // 调用出库单新增服务 - iOutBillService.insertDtl(jsonMst); - log.info("sendTask下发出库任务接口输出参数为：-------------------" + ErpResponse.requestOk().toString()); + GroupPlate plate = new GroupPlate(); + plate.setGroup_id(IdUtil.getStringId()); + plate.setStoragevehicle_code(json.getString("vehicle_code")); + plate.setMaterial_id(materDao.getMaterial_id()); + plate.setQty_unit_id(unitDao.getMeasure_unit_id()); + plate.setQty_unit_name(unitDao.getUnit_name()); + plate.setQty(BigDecimal.valueOf(json.getDoubleValue("quantity"))); + plate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("生成")); + plate.setExt_code(json.getString("ext_code")); + plate.setExt_type(json.getString("ext_type")); + plate.setCreate_name("ERP"); + plate.setCreate_time(DateUtil.now()); + plates.add(plate); + } + //保存组盘记录到单据表 + iPmFormDataService.saveBatch(dtlArr); + //保存组盘记录到组盘表 + iMdPbGroupplateService.saveBatch(plates); + + log.info("sendGroupplate下发组盘接口输出参数为：-------------------" + ErpResponse.requestOk().toString()); return ErpResponse.requestOk(); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosCheckController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosCheckController.java deleted file mode 100644 index 6451069..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosCheckController.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.nl.wms.pda_manage.ios_manage.controller; - - -import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; -import org.nl.wms.pda_manage.ios_manage.service.PdaIosCheckService; -import org.nl.wms.pda_manage.ios_manage.service.PdaIosInService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 手持盘点确认 控制层 - *

- * - * @author Liuxy - * @since 2025-06-06 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/groupMater") -@Slf4j -public class PdaIosCheckController { - - @Autowired - private PdaIosCheckService pdaIosCheckService; - @Autowired - private PdaIosInService pdaIosInService; - @PostMapping("/getDtl") - @Log("获取盘点明细") - @SaIgnore - public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(pdaIosCheckService.getDtl(whereJson), HttpStatus.OK); - } - - /** - * 组盘获取物料列表 - */ - @PostMapping("/maters") - @Log("获取物料列表") - @SaIgnore - public ResponseEntity> getMaterialList(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(pdaIosInService.getMaterialList(whereJson), HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("确认") - @SaIgnore - public ResponseEntity confirm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(pdaIosCheckService.confirm(whereJson), HttpStatus.OK); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosCheckService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosCheckService.java deleted file mode 100644 index d0df0dd..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosCheckService.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.nl.wms.pda_manage.ios_manage.service; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pda_manage.util.PdaResponse; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; - -/** - *

- * 手持盘点确认 服务类 - *

- * - * @author Liuxy - * @since 2025-06-06 - */ -public interface PdaIosCheckService extends IService { - - /** - * 获取盘点明细 - * @param whereJson { - * storagevehicle_code： 载具编码 - * struct_code： 仓位 - * } - * @return PdaResponse - */ - PdaResponse getDtl(JSONObject whereJson); - - /** - * 确认 - * @param whereJson { - * storagevehicle_code： 载具编码 - * struct_code：仓位编码 - * data: [ - * checkdtl_id: 明细标识 - * bill_code: 单据编码 - * bill_code: 单据编码 - * pcsn: 批次 - * base_qty: 库存数量 - * fac_qty: 盘点数量 - * qty_unit_name: 单位 - * ] - * } - * @return PdaResponse - */ - PdaResponse confirm(JSONObject whereJson); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosCheckServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosCheckServiceImpl.java deleted file mode 100644 index 0f027c7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosCheckServiceImpl.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.nl.wms.pda_manage.ios_manage.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.pda_manage.ios_manage.service.PdaIosCheckService; -import org.nl.wms.pda_manage.util.PdaResponse; -import org.nl.wms.warehouse_manage.enums.IOSEnum; -import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService; -import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; -import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckdtlMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 手持盘点确认 实现类 - *

- * - * @author Liuxy - * @since 2025-06-06 - */ -@Service -public class PdaIosCheckServiceImpl extends ServiceImpl implements PdaIosCheckService { - - /** - * 盘点单主表服务 - */ - @Autowired - private IStIvtCheckmstService iStIvtCheckmstService; - - /** - * 盘点单明细服务 - */ - @Autowired - private IStIvtCheckdtlService iStIvtCheckdtlService; - - @Override - public PdaResponse getDtl(JSONObject whereJson) { - return PdaResponse.requestParamOk(this.baseMapper.getPdaDtl(whereJson)); - } - - @Override - @Transactional - public PdaResponse confirm(JSONObject whereJson) { - List dataList = whereJson.getJSONArray("data").toJavaList(JSONObject.class); - // 查询明细 - List dtlDaoList = this.list( - new QueryWrapper().lambda() - .in(StIvtCheckdtl::getCheckdtl_id, dataList.stream() - .map(row -> row.getString("checkdtl_id")) - .collect(Collectors.toList()) - ) - ); - // 需要更新的明细集合 - List needUpdateList = new ArrayList<>(); - for (JSONObject json : dataList) { - StIvtCheckdtl dtlDao = dtlDaoList.stream() - .filter(row -> row.getCheckdtl_id().equals(json.getString("checkdtl_id"))) - .findFirst().orElse(null); - dtlDao.setStatus(IOSEnum.CHECK_DTL_STATUS.code("完成")); - dtlDao.setFac_qty(json.getBigDecimal("fac_qty")); - needUpdateList.add(dtlDao); - } - // 更新明细 - this.updateBatchById(needUpdateList); - // 更新主表状态 - iStIvtCheckmstService.updateMst(dtlDaoList.get(0).getCheck_id()); - // 创建损益单 - iStIvtCheckdtlService.createMore(needUpdateList,dtlDaoList.get(0).getCheck_id()); - return PdaResponse.requestOk(); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java index d4e551a..2d165c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java @@ -67,12 +67,20 @@ public class PmFormData extends Model { */ private String material_code; + /** + * 物料code + */ + private String material_id; + /** * 批次号 */ private String pcsn; - + /** + * 数量 + */ + private BigDecimal plan_qty; /** * 数量 @@ -105,9 +113,9 @@ public class PmFormData extends Model { /** - * 载具组盘id + * 料框号 */ - private String vehicle_id; + private String vehicle_code2; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java index 2478723..a0821e5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBaseTaskService.java @@ -72,5 +72,10 @@ public interface ISchBaseTaskService extends IService { SchBaseTask getByCode(String taskCode); - + /** + * 根据任务号和子托盘查询未完成的任务 + * @param sub_tray + * @return + */ + Integer findUnFinishTasksBySub_tray(String sub_tray); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java index 07846ea..5dcbd4e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseTaskServiceImpl.java @@ -48,9 +48,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); + lam.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode()) + .eq(SchBaseTask::getVehicle_code, sub_tray) + .eq(SchBaseTask::getIs_delete, false); + Integer taskCount = schBaseTaskMapper.selectCount(lam); + return taskCount; + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/CheckController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/CheckController.java deleted file mode 100644 index e882be1..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/CheckController.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.nl.wms.warehouse_manage.controller; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService; -import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto; -import org.springframework.beans.factory.annotation.Autowired; -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; -import java.util.Set; - -/** - *

- * 盘点 控制层 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/check") -@Slf4j -public class CheckController { - - @Autowired - private IStIvtCheckmstService iStIvtCheckmstService; - - @GetMapping - @Log("查询盘点单") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { - return new ResponseEntity<>(TableDataInfo.build(iStIvtCheckmstService.queryAll(whereJson, page)), HttpStatus.OK); - } - - @PostMapping - @Log("新增盘点单") - public ResponseEntity create(@Validated @RequestBody CheckInsertDto dto) { - iStIvtCheckmstService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改盘点单") - public ResponseEntity update(@Validated @RequestBody CheckInsertDto dto) { - iStIvtCheckmstService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @DeleteMapping - @Log("删除盘点单") - public ResponseEntity delete(@RequestBody Set ids) { - iStIvtCheckmstService.delete(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getDtl") - @Log("获取明细") - public ResponseEntity getDtl(@RequestParam Map whereJson) { - return new ResponseEntity<>(iStIvtCheckmstService.getDtl(whereJson),HttpStatus.OK); - } - - @PostMapping("/saveCheck") - @Log("保存盘点") - public ResponseEntity saveCheck(@RequestBody CheckInsertDto dto) { - iStIvtCheckmstService.saveCheck(dto); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("确认盘点") - public ResponseEntity confirm(@RequestBody CheckInsertDto dto) { - iStIvtCheckmstService.confirm(dto); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoreOrlessController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoreOrlessController.java deleted file mode 100644 index 5b7b432..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/controller/MoreOrlessController.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.warehouse_manage.controller; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessmstService; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst; -import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto; -import org.springframework.beans.factory.annotation.Autowired; -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; -import java.util.Set; - -/** - *

- * 损益 控制层 - *

- * - * @author Liuxy - * @since 2025-05-28 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/moreorLess") -@Slf4j -public class MoreOrlessController { - - @Autowired - private IStIvtMoreorlessmstService iStIvtMoreorlessmstService; - - @GetMapping - @Log("查询损益单") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { - return new ResponseEntity<>(TableDataInfo.build(iStIvtMoreorlessmstService.queryAll(whereJson, page)), HttpStatus.OK); - } - - @PostMapping - @Log("新增损益单") - public ResponseEntity create(@Validated @RequestBody MoreOrLessInsertDto dto) { - iStIvtMoreorlessmstService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改损益单") - public ResponseEntity update(@Validated @RequestBody MoreOrLessInsertDto dto) { - iStIvtMoreorlessmstService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @DeleteMapping - @Log("删除损益单") - public ResponseEntity delete(@RequestBody Set ids) { - iStIvtMoreorlessmstService.delete(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/queryMolDtl") - @Log("查询损益单明细") - public ResponseEntity queryMolDtl(@RequestParam Map whereJson) { - return new ResponseEntity<>(iStIvtMoreorlessmstService.queryMolDtl(whereJson), HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("强制确认") - public ResponseEntity confirm(@RequestBody StIvtMoreorlessmst dao) { - iStIvtMoreorlessmstService.confirm(dao); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java index ea52c2b..8178373 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java @@ -52,21 +52,6 @@ public enum IOSEnum { // 移库单明细状态 MOVE_DTL_STATUS(MapOf.of("生成", "10", "执行中", "20", "完成", "99")), - - // 损益单据类型 - MORE_MST_TYPE(MapOf.of("手工损益", "1001", "盘点损益", "1002")), - - // 损益单状态 - MORE_MST_STATUS(MapOf.of("生成", "10", "审核", "20", "完成", "99")), - - // 损益类型 - MORE_TYPE(MapOf.of("损", "1", "溢", "2")), - - // 盘点单主表状态 - CHECK_MST_STATUS(MapOf.of("生成", "10", "盘点中", "20", "完成", "99")), - - // 盘点明细状态 - CHECK_DTL_STATUS(MapOf.of("生成", "10", "盘点中", "20", "已盘点", "30", "完成", "99")), ; private Map code; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckdtlService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckdtlService.java deleted file mode 100644 index 6daa6ba..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckdtlService.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.nl.wms.warehouse_manage.service; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; -import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto; - -import java.util.List; -import java.util.Map; - -/** - *

- * 盘点单明细表 服务类 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -public interface IStIvtCheckdtlService extends IService { - - /** - * 新增明细 - * @param dto 新增修改实体dto - */ - void createCheckDtl(CheckInsertDto dto); - - /** - * 获取明细 - * @param whereJson { - * check_id：主表标识 - * } - * @return List - */ - List getDtl(Map whereJson); - - /** - * 创建损益单据 - * @param list 明细实体类集合 - */ - void createMore(List list, String check_id); - - /** - * 手持盘点获取明细 - * @param whereJson { - * storagevehicle_code：载具号 - * } - * @return List - */ - List getPdaDtl(JSONObject whereJson); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckmstService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckmstService.java deleted file mode 100644 index c8035dd..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtCheckmstService.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.nl.wms.warehouse_manage.service; - -import com.alibaba.fastjson.JSONObject; -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.warehouse_manage.service.dao.StIvtCheckmst; -import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - *

- * 盘点单主表 服务类 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -public interface IStIvtCheckmstService extends IService { - /** - * 分页查询 - * @param whereJson : {查询参数} - * @param page : 分页对象 - * @return 返回结果 - */ - IPage queryAll(Map whereJson, PageQuery page); - - /** - * 新增盘点单 - * @param dto 新增修改实体dto - */ - void create(CheckInsertDto dto); - - /** - * 修改盘点单 - * @param dto：新增修改dto实体类 - */ - void update(CheckInsertDto dto); - - /** - * 删除盘点单 - * @param ids 标识集合 - */ - void delete(Set ids); - - /** - * 获取明细 - * @param whereJson { - * check_id： 主表标识 - * } - * @return List - */ - List getDtl(Map whereJson); - - /** - * 保存盘点单 - * @param dto 新增修改dto实体类 - */ - void saveCheck(CheckInsertDto dto); - - /** - * 确认盘点 - * @param dto 新增修改dto实体类 - */ - void confirm(CheckInsertDto dto); - - /** - * 更新主表状态 - * @param check_id 主表id - */ - void updateMst(String check_id); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessdtlService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessdtlService.java deleted file mode 100644 index 5e87e2c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessdtlService.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.nl.wms.warehouse_manage.service; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl; -import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto; - -import java.util.List; -import java.util.Map; - -/** - *

- * 损溢单明细表 服务类 - *

- * - * @author Liuxy - * @since 2025-05-28 - */ -public interface IStIvtMoreorlessdtlService extends IService { - - /** - * 创建明细 - * @param dto 新增修改实体类 - */ - void createMoreDtl(MoreOrLessInsertDto dto); - - /** - * 查询明细 - * @param whereJson { - * mol_id：标识id - * } - * @return List - */ - List queryMolDtl(Map whereJson); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessmstService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessmstService.java deleted file mode 100644 index 78d2781..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IStIvtMoreorlessmstService.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.nl.wms.warehouse_manage.service; - -import com.alibaba.fastjson.JSONObject; -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.warehouse_manage.service.dao.StIvtMoreorlessmst; -import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - *

- * 损溢单主表 服务类 - *

- * - * @author Liuxy - * @since 2025-05-28 - */ -public interface IStIvtMoreorlessmstService extends IService { - - /** - * 分页查询 - * @param whereJson : {查询参数} - * @param page : 分页对象 - * @return 返回结果 - */ - IPage queryAll(Map whereJson, PageQuery page); - - /** - * 新增损益单 - * @param dto：新增修改dto实体类 - */ - String create(MoreOrLessInsertDto dto); - - /** - * 修改损益单 - * @param dto：新增修改dto实体类 - */ - void update(MoreOrLessInsertDto dto); - - /** - * 删除损益单 - * @param ids id集合 - */ - void delete(Set ids); - - /** - * 查询损益单明细 - * @param whereJson { - * mol_id: 标识id - * } - * @return List - */ - List queryMolDtl(Map whereJson); - - /** - * 强制确认 - * @param dao 主表实体类 - */ - void confirm(StIvtMoreorlessmst dao); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.java deleted file mode 100644 index 1e5c968..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.nl.wms.warehouse_manage.service.dao.mapper; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; - -import java.util.List; -import java.util.Map; - -/** - *

- * 盘点单明细表 Mapper 接口 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -public interface StIvtCheckdtlMapper extends BaseMapper { - - /** - * 获取明细 - * @param whereJson { - * check_id 主表标识 - * } - * @return List - */ - List getDtl(@Param("param") Map whereJson); - - /** - * 手持获取盘点明细 - * @param whereJson { - * storagevehicle_code：载具编码 - * struct_code： 仓位 - * } - * @return List - */ - List getPdaDtl(@Param("param") JSONObject whereJson); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.xml deleted file mode 100644 index 8ff4979..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckdtlMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.java deleted file mode 100644 index 1789610..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.wms.warehouse_manage.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst; - -/** - *

- * 盘点单主表 Mapper 接口 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -public interface StIvtCheckmstMapper extends BaseMapper { -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.xml deleted file mode 100644 index 4abd8d2..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtCheckmstMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.java deleted file mode 100644 index ca4fae3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.nl.wms.warehouse_manage.service.dao.mapper; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl; - -import java.util.List; -import java.util.Map; - -/** - *

- * 损溢单明细表 Mapper 接口 - *

- * - * @author Liuxy - * @since 2025-05-28 - */ -public interface StIvtMoreorlessdtlMapper extends BaseMapper { - - /** - * 查询明细 - * @param whereJson { - * mol_id 标识id - * } - * @return List - */ - List queryMolDtl(@Param("param") Map whereJson); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.xml deleted file mode 100644 index cbd69d4..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessdtlMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.java deleted file mode 100644 index 772a260..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.nl.wms.warehouse_manage.service.dao.mapper; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst; - -import java.util.Map; - -/** - *

- * 损溢单主表 Mapper 接口 - *

- * - * @author Liuxy - * @since 2025-05-28 - */ -public interface StIvtMoreorlessmstMapper extends BaseMapper { - - /** - * 分页查询 - * @param page 分页条件 - * @param whereJson 查询条件 - * @return IPage - */ - IPage queryAllByPage(Page page,@Param("param") Map whereJson); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.xml deleted file mode 100644 index bbe04a1..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/StIvtMoreorlessmstMapper.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/CheckInsertDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/CheckInsertDto.java deleted file mode 100644 index 24068be..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/CheckInsertDto.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.nl.wms.warehouse_manage.service.dto; - -import com.alibaba.fastjson.JSONObject; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 盘点新增修改dto实体类 - * @author Liuxy - * 2025/5/29 - */ -@Data -public class CheckInsertDto { - - /** - * 单据标识 - */ - private String check_id; - - /** - * 单据类型 - */ - private String check_type; - - /** - * 生成方式 - */ - private String create_mode; - - /** - * 明细数 - */ - private BigDecimal dtl_num; - - /** - * 备注 - */ - private String remark; - - /** - * 状态 - */ - private String status; - - /** - * 仓库id - */ - private String stor_id; - - /** - * 仓库名称 - */ - private String stor_name; - - /** - * 明细数据： - * { - * sect_code 库区 - * struct_code 货位 - * storagevehicle_code 载具编码 - * material_id 物料id - * material_code 物料编码 - * pcsn 批次 - * base_qty 库存数量 - * fac_qty 盘点数量 - * qty_unit_id 计量单位标识 - * qty_unit_name 计量单位名称 - * status 状态 - * remark 备注 - * } - */ - private List tableData; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoreOrLessInsertDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoreOrLessInsertDto.java deleted file mode 100644 index 7a7c429..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dto/MoreOrLessInsertDto.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.nl.wms.warehouse_manage.service.dto; - -import com.alibaba.fastjson.JSONObject; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 损益新增修改dto实体类 - * @author Liuxy - * 2025/5/28 - */ -@Data -public class MoreOrLessInsertDto { - - /** - * 单据标识 - */ - private String mol_id; - - /** - * 单据类型 - */ - private String mol_inv_type; - - /** - * 损益类型 - */ - private String mol_type; - - /** - * 业务日期 - */ - private String biz_date; - - /** - * 明细数 - */ - private BigDecimal dtl_num; - - /** - * 仓库标识 - */ - private String stor_id; - - /** - * 备注 - */ - private String remark; - - /** - * 总数量 - */ - private BigDecimal total_qty; - - /** - * 生成方式 - */ - private String create_mode; - - /** - * 状态 - */ - private String status; - - /** - * 明细数据： - * { - * material_code 物料编码 - * material_id 物料id - * material_name 物料名称 - * pcsn 批次 - * ivt_qty 库存数量 - * mol_qty 损益数量 - * qty_unit_id 计量单位标识 - * qty_unit_name 计量单位名称 - * storagevehicle_code 载具编码 - * sect_code 库区 - * struct_code 仓位 - * status 执行状态 - * remark 备注 - * source_bill_code 源单据编码（盘点业务使用） - * } - */ - private List tableData; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java index 54ffc64..528f8bf 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java @@ -534,10 +534,6 @@ public class RawAssistIStorServiceImpl extends ServiceImpl(GroupPlate.class) - // .eq(GroupPlate::getStoragevehicle_code,map.get("storagevehicle_code")) - // ); - // task_form.put("group_id", groupPlate.getGroup_id()); StInTask stInTask = SpringContextHolder.getBean("STInTask"); String task_id = stInTask.create(task_form); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java index 34fefb9..5d5622c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java @@ -88,7 +88,7 @@ public class RetrunServiceImpl extends ServiceImpl i lambda.ge(ObjectUtil.isNotEmpty(begin_time), IOStorInv::getInput_time, begin_time); lambda.lt(ObjectUtil.isNotEmpty(end_time), IOStorInv::getInput_time, end_time); lambda.eq(IOStorInv::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")); - lambda.eq(IOStorInv::getBill_status, IOSEnum.CHECK_MST_STATUS.code("完成")); + lambda.eq(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成")); lambda.orderByDesc(IOStorInv::getInput_time); return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), lambda diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckdtlServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckdtlServiceImpl.java deleted file mode 100644 index 18743e2..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckdtlServiceImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.nl.wms.warehouse_manage.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.NumberUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.common.utils.IdUtil; -import org.nl.wms.warehouse_manage.enums.IOSConstant; -import org.nl.wms.warehouse_manage.enums.IOSEnum; -import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService; -import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService; -import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessmstService; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst; -import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckdtlMapper; -import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto; -import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *

- * 盘点单明细表 服务实现类 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -@Service -public class StIvtCheckdtlServiceImpl extends ServiceImpl implements IStIvtCheckdtlService { - - /** - * 盘点单主表服务 - */ - @Autowired - private IStIvtCheckmstService iStIvtCheckmstService; - - /** - * 损益单主表服务 - */ - @Autowired - private IStIvtMoreorlessmstService iStIvtMoreorlessmstService; - - @Override - public void createCheckDtl(CheckInsertDto dto) { - // 批量新增集合 - List dtlDaoList = new ArrayList<>(); - for (int i = 0; i < dto.getTableData().size(); i++) { - JSONObject json = dto.getTableData().get(i); - if (json.getString("status").equals(IOSEnum.CHECK_DTL_STATUS.code("完成"))) { - continue; - } - StIvtCheckdtl dao = new StIvtCheckdtl(); - dao.setCheckdtl_id(IdUtil.getStringId()); - dao.setCheck_id(dto.getCheck_id()); - dao.setSeq_no(BigDecimal.valueOf(i+1)); - dao.setSect_code(json.getString("sect_code")); - dao.setStruct_code(json.getString("struct_code")); - dao.setStoragevehicle_code(json.getString("storagevehicle_code")); - dao.setMaterial_id(json.getString("material_id")); - dao.setPcsn(json.getString("pcsn")); - dao.setBase_qty(json.getBigDecimal("base_qty")); - dao.setFac_qty(json.getBigDecimal("fac_qty")); - dao.setQty_unit_id(json.getString("qty_unit_id")); - dao.setQty_unit_name(json.getString("qty_unit_name")); - dao.setStatus(json.getString("status")); - dao.setRemark(json.getString("remark")); - dtlDaoList.add(dao); - } - this.saveBatch(dtlDaoList); - } - - @Override - public List getDtl(Map whereJson) { - return this.baseMapper.getDtl(whereJson); - } - - @Override - public void createMore(List dtlDaoList, String check_id) { - StIvtCheckmst mstDao = iStIvtCheckmstService.getById(check_id); - for (StIvtCheckdtl dao : dtlDaoList) { - // 组织创建损益单据主数据 - MoreOrLessInsertDto moreDto = new MoreOrLessInsertDto(); - moreDto.setMol_inv_type(IOSEnum.MORE_MST_TYPE.code("盘点损益")); - // 根据库存数量以及盘点数量来判断损益类型 - double base_qty = dao.getBase_qty().doubleValue(); - double fac_qty = dao.getFac_qty().doubleValue(); - double mol_qty; - if (base_qty == fac_qty) { - continue; - } else if (base_qty > fac_qty) { - moreDto.setMol_type(IOSEnum.MORE_TYPE.code("损")); - mol_qty = NumberUtil.sub(base_qty, fac_qty); - } else { - moreDto.setMol_type(IOSEnum.MORE_TYPE.code("溢")); - mol_qty = NumberUtil.sub(fac_qty, base_qty); - } - moreDto.setBiz_date(DateUtil.today()); - moreDto.setDtl_num(BigDecimal.valueOf(1)); - moreDto.setStor_id(mstDao.getStor_id()); - moreDto.setRemark("由明细标识【"+dao.getCheck_optid()+"】创建"); - moreDto.setTotal_qty(BigDecimal.valueOf(mol_qty)); - moreDto.setCreate_mode(IOSConstant.CREATE_TYPE); - moreDto.setStatus(IOSEnum.MORE_MST_STATUS.code("生成")); - - // 创建损益单明细数据 - List tableData = new ArrayList<>(); - JSONObject jsonDtl = new JSONObject(); - jsonDtl.put("material_id", dao.getMaterial_id()); - jsonDtl.put("pcsn", dao.getPcsn()); - jsonDtl.put("ivt_qty", base_qty); - jsonDtl.put("mol_qty", mol_qty); - jsonDtl.put("qty_unit_id", dao.getQty_unit_id()); - jsonDtl.put("qty_unit_name", dao.getQty_unit_name()); - jsonDtl.put("storagevehicle_code", dao.getStoragevehicle_code()); - jsonDtl.put("sect_code", dao.getSect_code()); - jsonDtl.put("struct_code", dao.getStruct_code()); - jsonDtl.put("status", IOSEnum.MORE_MST_STATUS.code("生成")); - jsonDtl.put("remark", "由明细标识【"+dao.getCheck_optid()+"】创建"); - jsonDtl.put("source_bill_code", mstDao.getCheck_code()); - tableData.add(jsonDtl); - moreDto.setTableData(tableData); - //调用创建 - String mol_id = iStIvtMoreorlessmstService.create(moreDto); - // 调用强制确认 - iStIvtMoreorlessmstService.confirm(iStIvtMoreorlessmstService.getById(mol_id)); - } - } - - @Override - public List getPdaDtl(JSONObject whereJson) { - return this.baseMapper.getPdaDtl(whereJson); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckmstServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckmstServiceImpl.java deleted file mode 100644 index 0db92c0..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtCheckmstServiceImpl.java +++ /dev/null @@ -1,188 +0,0 @@ -package org.nl.wms.warehouse_manage.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -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.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.utils.CodeUtil; -import org.nl.common.utils.IdUtil; -import org.nl.common.utils.SecurityUtils; -import org.nl.wms.basedata_manage.enums.BaseDataEnum; -import org.nl.wms.warehouse_manage.enums.IOSConstant; -import org.nl.wms.warehouse_manage.enums.IOSEnum; -import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService; -import org.nl.wms.warehouse_manage.service.IStIvtCheckmstService; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl; -import org.nl.wms.warehouse_manage.service.dao.StIvtCheckmst; -import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtCheckmstMapper; -import org.nl.wms.warehouse_manage.service.dto.CheckInsertDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - *

- * 盘点单主表 服务实现类 - *

- * - * @author Liuxy - * @since 2025-05-29 - */ -@Service -public class StIvtCheckmstServiceImpl extends ServiceImpl implements IStIvtCheckmstService { - - @Autowired - private IStIvtCheckdtlService iStIvtCheckdtlService; - - @Override - public IPage queryAll(Map whereJson, PageQuery page) { - String check_code = MapUtil.getStr(whereJson, "check_code"); - String stor_id = MapUtil.getStr(whereJson, "stor_id"); - String status = MapUtil.getStr(whereJson, "status"); - String check_type = MapUtil.getStr(whereJson, "check_type"); - String create_mode = MapUtil.getStr(whereJson, "create_mode"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); - // 查询条件 - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); - queryWrapper.like(ObjectUtil.isNotEmpty(check_code), StIvtCheckmst::getCheck_code, check_code); - queryWrapper.eq(ObjectUtil.isNotEmpty(stor_id), StIvtCheckmst::getStor_id, stor_id); - queryWrapper.eq(ObjectUtil.isNotEmpty(check_type), StIvtCheckmst::getCheck_type, check_type); - queryWrapper.eq(ObjectUtil.isNotEmpty(status), StIvtCheckmst::getStatus, status); - queryWrapper.eq(ObjectUtil.isNotEmpty(create_mode), StIvtCheckmst::getCreate_mode, create_mode); - queryWrapper.ge(ObjectUtil.isNotEmpty(begin_time), StIvtCheckmst::getInput_time, begin_time); - queryWrapper.lt(ObjectUtil.isNotEmpty(end_time), StIvtCheckmst::getInput_time, end_time); - queryWrapper.eq(StIvtCheckmst::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")); - queryWrapper.orderByDesc(StIvtCheckmst::getInput_time); - return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), - queryWrapper - ); - } - - @Override - @Transactional - public void create(CheckInsertDto dto) { - // 主表 - StIvtCheckmst mstDao = new StIvtCheckmst(); - mstDao.setCheck_id(IdUtil.getStringId()); - mstDao.setCheck_code(CodeUtil.getNewCode("CHECK_BILL_CODE")); - mstDao.setCheck_type(dto.getCheck_type()); - mstDao.setStor_id(dto.getStor_id()); - mstDao.setStor_name(dto.getStor_name()); - mstDao.setDtl_num(dto.getDtl_num()); - mstDao.setCreate_mode(dto.getCreate_mode()); - mstDao.setStatus(dto.getStatus()); - mstDao.setRemark(dto.getRemark()); - mstDao.setInput_optid(SecurityUtils.getCurrentUserId()); - mstDao.setInput_optname(SecurityUtils.getCurrentNickName()); - mstDao.setInput_time(DateUtil.now()); - this.save(mstDao); - // 明细 - dto.setCheck_id(mstDao.getCheck_id()); - iStIvtCheckdtlService.createCheckDtl(dto); - } - - @Override - @Transactional - public void update(CheckInsertDto dto) { - StIvtCheckmst mstDao = this.getById(dto.getCheck_id()); - mstDao.setStor_id(dto.getStor_id()); - mstDao.setCheck_type(dto.getCheck_type()); - mstDao.setDtl_num(dto.getDtl_num()); - this.updateById(mstDao); - // 删除老明细 - iStIvtCheckdtlService.remove( - new QueryWrapper().lambda() - .eq(StIvtCheckdtl::getCheck_id, mstDao.getCheck_id()) - ); - // 新增明细 - iStIvtCheckdtlService.createCheckDtl(dto); - } - - @Override - public void delete(Set ids) { - this.update( - new UpdateWrapper().lambda() - .in(StIvtCheckmst::getCheck_id, ids) - .set(StIvtCheckmst::getIs_delete, IOSConstant.IS_DELETE_YES) - ); - } - - @Override - public List getDtl(Map whereJson) { - return iStIvtCheckdtlService.getDtl(whereJson); - } - - @Override - @Transactional - public void saveCheck(CheckInsertDto dto) { - StIvtCheckmst mstDao = this.getById(dto.getCheck_id()); - mstDao.setStatus(IOSEnum.CHECK_MST_STATUS.code("盘点中")); - this.updateById(mstDao); - // 更新明细 - iStIvtCheckdtlService.remove( - new QueryWrapper().lambda() - .eq(StIvtCheckdtl::getCheck_id, mstDao.getCheck_id()) - .ne(StIvtCheckdtl::getStatus, IOSEnum.CHECK_DTL_STATUS.code("完成")) - ); - iStIvtCheckdtlService.createCheckDtl(dto); - iStIvtCheckdtlService.update( - new UpdateWrapper().lambda() - .eq(StIvtCheckdtl::getCheck_id, dto.getCheck_id()) - .ne(StIvtCheckdtl::getStatus, IOSEnum.CHECK_DTL_STATUS.code("完成")) - .set(StIvtCheckdtl::getStatus, IOSEnum.CHECK_DTL_STATUS.code("盘点中")) - ); - } - - @Override - @Transactional - public void confirm(CheckInsertDto dto) { - // 更新主表 - StIvtCheckmst mstDao = this.getById(dto.getCheck_id()); - mstDao.setStatus(IOSEnum.CHECK_MST_STATUS.code("完成")); - mstDao.setConfirm_optid(SecurityUtils.getCurrentUserId()); - mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName()); - mstDao.setConfirm_time(DateUtil.now()); - this.updateById(mstDao); - // 创建损益单 - iStIvtCheckdtlService.createMore(iStIvtCheckdtlService.list( - new QueryWrapper().lambda() - .eq(StIvtCheckdtl::getCheck_id, mstDao.getCheck_id()) - .ne(StIvtCheckdtl::getStatus, IOSEnum.CHECK_DTL_STATUS.code("完成")) - ), mstDao.getCheck_id()); - // 更新明细 - iStIvtCheckdtlService.update( - new UpdateWrapper().lambda() - .eq(StIvtCheckdtl::getCheck_id, dto.getCheck_id()) - .set(StIvtCheckdtl::getStatus, IOSEnum.CHECK_DTL_STATUS.code("完成")) - ); - } - - @Override - public void updateMst(String check_id) { - StIvtCheckmst mstDao = this.getById(check_id); - List dtlDaoList = iStIvtCheckdtlService.list( - new QueryWrapper().lambda() - .eq(StIvtCheckdtl::getCheck_id, check_id) - ); - boolean is_confirm = dtlDaoList.stream() - .allMatch(row -> row.getStatus().equals(IOSEnum.CHECK_DTL_STATUS.code("完成"))); - - mstDao.setStatus(is_confirm ? IOSEnum.CHECK_MST_STATUS.code("完成") : IOSEnum.CHECK_MST_STATUS.code("盘点中")); - mstDao.setConfirm_optid(SecurityUtils.getCurrentUserId()); - mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName()); - mstDao.setConfirm_time(DateUtil.now()); - this.updateById(mstDao); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessdtlServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessdtlServiceImpl.java deleted file mode 100644 index b9b05bc..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessdtlServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.nl.wms.warehouse_manage.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.common.utils.IdUtil; -import org.nl.wms.warehouse_manage.enums.IOSEnum; -import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessdtlService; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl; -import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoreorlessdtlMapper; -import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *

- * 损溢单明细表 服务实现类 - *

- * - * @author Liuxy - * @since 2025-05-28 - */ -@Service -public class StIvtMoreorlessdtlServiceImpl extends ServiceImpl implements IStIvtMoreorlessdtlService { - - @Override - public void createMoreDtl(MoreOrLessInsertDto dto) { - // 批量新增明细集合 - List dtlDaoList = new ArrayList<>(); - - for (int i = 0; i < dto.getTableData().size(); i++) { - JSONObject json = dto.getTableData().get(i); - StIvtMoreorlessdtl dao = new StIvtMoreorlessdtl(); - dao.setMol_dtl_id(IdUtil.getStringId()); - dao.setMol_id(dto.getMol_id()); - dao.setSeq_no(BigDecimal.valueOf(i+1)); - dao.setStruct_code(json.getString("struct_code")); - dao.setSect_code(json.getString("sect_code")); - dao.setStoragevehicle_code(json.getString("storagevehicle_code")); - dao.setMaterial_id(json.getString("material_id")); - dao.setPcsn(json.getString("pcsn")); - dao.setQty_unit_id(json.getString("qty_unit_id")); - dao.setQty_unit_name(json.getString("qty_unit_name")); - dao.setMol_qty(json.getBigDecimal("mol_qty")); - dao.setStatus(IOSEnum.MORE_MST_STATUS.code("生成")); - dao.setSource_bill_code(json.getString("source_bill_code")); - dtlDaoList.add(dao); - } - this.saveBatch(dtlDaoList); - } - - @Override - public List queryMolDtl(Map whereJson) { - return this.baseMapper.queryMolDtl(whereJson); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessmstServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessmstServiceImpl.java deleted file mode 100644 index 17b7c37..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoreorlessmstServiceImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.nl.wms.warehouse_manage.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.utils.CodeUtil; -import org.nl.common.utils.IdUtil; -import org.nl.common.utils.SecurityUtils; -import org.nl.wms.warehouse_manage.enums.IOSConstant; -import org.nl.wms.warehouse_manage.enums.IOSEnum; -import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessdtlService; -import org.nl.wms.warehouse_manage.service.IStIvtMoreorlessmstService; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessdtl; -import org.nl.wms.warehouse_manage.service.dao.StIvtMoreorlessmst; -import org.nl.wms.warehouse_manage.service.dao.mapper.StIvtMoreorlessmstMapper; -import org.nl.wms.warehouse_manage.service.dto.MoreOrLessInsertDto; -import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - *

- * 损溢单主表 服务实现类 - *

- * - * @author Liuixy - * @since 2025-05-28 - */ -@Service -public class StIvtMoreorlessmstServiceImpl extends ServiceImpl implements IStIvtMoreorlessmstService { - - /** - * 损益明细服务 - */ - @Autowired - private IStIvtMoreorlessdtlService iStIvtMoreorlessdtlService; - - /** - * 变更库存工具类 - */ - @Autowired - private UpdateIvtUtils updateIvtUtils; - - @Override - public IPage queryAll(Map whereJson, PageQuery page) { - return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), - whereJson); - } - - @Override - @Transactional - public String create(MoreOrLessInsertDto dto) { - // 主表 - StIvtMoreorlessmst mstDao = new StIvtMoreorlessmst(); - mstDao.setMol_id(IdUtil.getStringId()); - mstDao.setMol_code(CodeUtil.getNewCode("MORE_BILL_CODE")); - mstDao.setMol_type(dto.getMol_type()); - mstDao.setMol_inv_type(dto.getMol_inv_type()); - mstDao.setStor_id(dto.getStor_id()); - mstDao.setDtl_num(dto.getDtl_num()); - mstDao.setTotal_qty(dto.getTotal_qty()); - mstDao.setCreate_mode(dto.getCreate_mode()); - mstDao.setInput_optid(SecurityUtils.getCurrentUserId()); - mstDao.setInput_optname(SecurityUtils.getCurrentNickName()); - mstDao.setInput_time(DateUtil.now()); - mstDao.setStatus(dto.getStatus()); - this.save(mstDao); - - // 明细 - dto.setMol_id(mstDao.getMol_id()); - iStIvtMoreorlessdtlService.createMoreDtl(dto); - return mstDao.getMol_id(); - } - - @Override - @Transactional - public void update(MoreOrLessInsertDto dto) { - StIvtMoreorlessmst mstDao = this.getById(dto.getMol_id()); - mstDao.setMol_type(dto.getMol_type()); - mstDao.setStor_id(dto.getStor_id()); - mstDao.setDtl_num(dto.getDtl_num()); - mstDao.setTotal_qty(dto.getTotal_qty()); - mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId()); - mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName()); - mstDao.setUpdate_time(DateUtil.now()); - this.updateById(mstDao); - - // 删除老的所有明细 - iStIvtMoreorlessdtlService.remove( - new QueryWrapper().lambda() - .eq(StIvtMoreorlessdtl::getMol_id, mstDao.getMol_id()) - ); - // 新增明细 - iStIvtMoreorlessdtlService.createMoreDtl(dto); - } - - @Override - @Transactional - public void delete(Set ids) { - this.update( - new UpdateWrapper().lambda() - .in(StIvtMoreorlessmst::getMol_id,ids) - .set(StIvtMoreorlessmst::getIs_delete, IOSConstant.IS_DELETE_YES) - ); - } - - @Override - public List queryMolDtl(Map whereJson) { - return iStIvtMoreorlessdtlService.queryMolDtl(whereJson); - } - - @Override - @Transactional - public void confirm(StIvtMoreorlessmst dao) { - // 更新主表 - dao.setStatus(IOSEnum.MORE_MST_STATUS.code("完成")); - dao.setConfirm_optid(SecurityUtils.getCurrentUserId()); - dao.setConfirm_optname(SecurityUtils.getCurrentNickName()); - dao.setConfirm_time(DateUtil.now()); - this.updateById(dao); - // 查询所有明细 - List dtlDaoList = iStIvtMoreorlessdtlService.list( - new QueryWrapper().lambda() - .eq(StIvtMoreorlessdtl::getMol_id, dao.getMol_id()) - ); - // 更新库存 - for (StIvtMoreorlessdtl dto : dtlDaoList) { - JSONObject json = new JSONObject(); - json.put("type", dao.getMol_type().equals(IOSEnum.MORE_TYPE.code("损")) - ? IOSConstant.UPDATE_IVT_TYPE_SUB_CANUSE_IVT : IOSConstant.UPDATE_IVT_TYPE_ADD_CANUSE_IVT); - json.put("storagevehicle_code",dto.getStoragevehicle_code()); - json.put("material_id",dto.getMaterial_id()); - json.put("pcsn",dto.getPcsn()); - json.put("qty_unit_id",dto.getQty_unit_id()); - json.put("qty_unit_name",dto.getQty_unit_name()); - json.put("change_qty",dto.getMol_qty()); - json.put("remark","由损益单据【"+dao.getMol_code()+"】变更库存数量【"+dto.getMol_qty()+"】"); - updateIvtUtils.updateIvt(json); - } - // 更新明细为完成 - iStIvtMoreorlessdtlService.update( - new UpdateWrapper().lambda() - .eq(StIvtMoreorlessdtl::getMol_id, dao.getMol_id()) - .set(StIvtMoreorlessdtl::getStatus, IOSEnum.MORE_MST_STATUS.code("完成")) - ); - } -}