From 7050ed0fdf38a46d637a7383e1a24cf5b6b160a2 Mon Sep 17 00:00:00 2001 From: chj <16637853242@163.com> Date: Mon, 11 Sep 2023 17:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E7=94=9F=E4=BA=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsProductPutController.java | 1 - .../WmsProductPutTrayController.java | 16 +++- .../com/op/wms/domain/WmsFpStorageNewsSn.java | 16 ++-- .../wms/mapper/WmsFpStorageNewsSnMapper.java | 8 ++ .../mapper/WmsProductPutTrayCodeMapper.java | 5 ++ .../service/IWmsProductPutTrayService.java | 7 ++ .../impl/WmsFpStorageNewsServiceImpl.java | 1 + .../impl/WmsProductPutServiceImpl.java | 5 +- .../impl/WmsProductPutTrayServiceImpl.java | 80 +++++++++++++------ .../mapper/wms/WmsFpStorageNewsSnMapper.xml | 48 +++++++++-- .../wms/WmsProductPutTrayCodeMapper.xml | 10 ++- 11 files changed, 152 insertions(+), 45 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index 053daf88f..2fd71e0fb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -97,5 +97,4 @@ public class WmsProductPutController extends BaseController { return AjaxResult.success(wmsProductPutService.selectWmsProductPutByWorkOrder(workOrder)); } - } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java index 8bf2871c4..7aef3c5aa 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutTrayController.java @@ -36,7 +36,7 @@ public class WmsProductPutTrayController extends BaseController { /** * 查询成品生产入库关联托盘列表 */ - @RequiresPermissions("wms:tray:list") +// @RequiresPermissions("wms:tray:list") @GetMapping("/list") public TableDataInfo list(WmsProductPutTray wmsProductPutTray) { startPage(); @@ -69,7 +69,7 @@ public class WmsProductPutTrayController extends BaseController { * 新增成品生产入库关联托盘 * 输入托盘号，点确认接口 */ - @RequiresPermissions("wms:tray:add") +// @RequiresPermissions("wms:tray:add") @Log(title = "成品生产入库关联托盘", businessType = BusinessType.INSERT) @PostMapping("/insertTary") public AjaxResult add(@RequestBody WmsProductPutTray wmsProductPutTray) { @@ -107,8 +107,18 @@ public class WmsProductPutTrayController extends BaseController { /** * 手持入库确认 */ - @PostMapping("/handPut") + @PostMapping("/wms/handPut") public AjaxResult insertWmsProductPutTrays(@RequestBody List wmsProductPutTrays){ return toAjax(wmsProductPutTrayService.insertWmsProductPutTrays(wmsProductPutTrays)); } + + /** + * 根据报工单号查询 + * @param workOrder + * @return + */ + @GetMapping("/listTary/{workOrder}") + public AjaxResult selectWmsProductPutTraysWorkOrder(@PathVariable("workOrder") String workOrder){ + return AjaxResult.success(wmsProductPutTrayService.selectWmsProductPutTraysWorkOrder(workOrder)); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java index dc189c18d..8cdbb24e0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java @@ -56,9 +56,9 @@ public class WmsFpStorageNewsSn extends BaseEntity { @Excel(name = "数量") private BigDecimal amount; - /** 备用1 */ - @Excel(name = "备用1") - private String userDefined1; + /** 批次号 */ + @Excel(name = "批次号") + private String batchNumber; /** 备用2 */ @Excel(name = "备用2") @@ -192,12 +192,12 @@ public class WmsFpStorageNewsSn extends BaseEntity { public BigDecimal getAmount() { return amount; } - public void setUserDefined1(String userDefined1) { - this.userDefined1 = userDefined1; + public void setBatchNumber(String batchNumber) { + this.batchNumber = batchNumber; } - public String getUserDefined1() { - return userDefined1; + public String getBatchNumber() { + return batchNumber; } public void setUserDefined2(String userDefined2) { this.userDefined2 = userDefined2; @@ -318,7 +318,7 @@ public class WmsFpStorageNewsSn extends BaseEntity { .append("sn", getSn()) .append("barCode", getBarCode()) .append("amount", getAmount()) - .append("userDefined1", getUserDefined1()) + .append("batchNumber", getBatchNumber()) .append("userDefined2", getUserDefined2()) .append("userDefined3", getUserDefined3()) .append("userDefined4", getUserDefined4()) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java index 2875c9770..106c5437e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java @@ -66,4 +66,12 @@ public interface WmsFpStorageNewsSnMapper { * @return */ public WmsFpStorageNewsSn selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode(@Param("productCode") String productCode, @Param("sn") String sn,@Param("wlCode") String wlCode); + + /** + * 根据托盘号和产品编码查询 + * @param sn + * @param productCode + * @return + */ + public WmsFpStorageNewsSn selectWmsFpStorageNewsSnBySnAndProductCode(@Param("sn") String sn,@Param("productCode") String productCode); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java index cd0c92b42..9f88877fd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutTrayCodeMapper.java @@ -66,6 +66,11 @@ public interface WmsProductPutTrayCodeMapper { */ public WmsProductPutTrayCode selectWmsProductPutTrayCodeBySn(String sn); + /** + * 修改点击确认接口 + */ + public List selectWmsProductPutTrayCodeBySn1(String sn); + /** * 根据箱码查询托盘号 * @param barcode diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java index e756d4e14..81279e5e0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutTrayService.java @@ -67,4 +67,11 @@ public interface IWmsProductPutTrayService { * 批量添加托盘信息 */ public int insertWmsProductPutTrays(List wmsProductPutTrays); + + /** + * 根据报工单号查询 + * @param workOrder + * @return + */ + public List selectWmsProductPutTraysWorkOrder(String workOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java index deb801323..a6113c7f5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java @@ -3,6 +3,7 @@ package com.op.wms.service.impl; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.WmsFpStorageNewsMapper; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index f73aa377e..521df355d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; import com.op.wms.domain.WmsProductPutTray; import com.op.wms.domain.WmsProductPutTrayCode; @@ -108,8 +109,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { * 手持接口：根据报工单号查询 */ @Override - @DS("#header.poolName") +// @DS("#header.poolName") public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder) { + //todo 需要修改 + DynamicDataSourceContextHolder.push("ds_1000"); /** * 根据报工单号查询所有托盘信息 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java index deaf990dc..1028450d1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Random; import com.alibaba.nacos.common.utils.UuidUtils; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.uuid.IdUtils; @@ -62,8 +63,10 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { * @return 成品生产入库关联托盘 */ @Override - @DS("#header.poolName") +// @DS("#header.poolName") public List selectWmsProductPutTrayList(WmsProductPutTray wmsProductPutTray) { + //todo 需要修改 + DynamicDataSourceContextHolder.push("ds_1000"); return wmsProductPutTrayMapper.selectWmsProductPutTrayList(wmsProductPutTray); } @@ -74,21 +77,26 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { * @return 结果 */ @Override - @DS("#header.poolName") +// @DS("#header.poolName") public int insertWmsProductPutTray(WmsProductPutTray wmsProductPutTray) { - WmsProductPutTrayCode wmsProductPutTrayCode = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn(wmsProductPutTray.getSn()); - if (wmsProductPutTrayCode.getRelatStatus().equals("0")){ - ValueOperations valueOperations = redisTemplate.opsForValue(); - String workOrder = valueOperations.get("workOrder"); - WmsProductPut wmsProductPut = wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); - wmsProductPutTray.setStorageId(IdUtils.fastSimpleUUID()); - wmsProductPutTray.setWorkOrder(workOrder); - wmsProductPutTray.setProductOrder(wmsProductPut.getProductOrder()); - wmsProductPutTray.setWhCode(wmsProductPut.getWhCode()); - wmsProductPutTray.setWaCode(wmsProductPut.getWaCode()); - wmsProductPutTray.setBatchNumber(wmsProductPut.getBatchNumber()); - }else { - throw new ServiceException("该托盘已经被占用！"); + //todo 需要修改 + DynamicDataSourceContextHolder.push("ds_1000"); +// WmsProductPutTrayCode wmsProductPutTrayCode = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn(wmsProductPutTray.getSn()); + List wmsProductPutTrayCodes = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn1(wmsProductPutTray.getSn()); + ValueOperations valueOperations = redisTemplate.opsForValue(); + String workOrder = valueOperations.get("workOrder"); + WmsProductPut wmsProductPut = wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); + for (WmsProductPutTrayCode wmsProductPutTrayCode : wmsProductPutTrayCodes) { + if (wmsProductPutTrayCode.getRelatStatus().equals("0")){ + wmsProductPutTray.setStorageId(IdUtils.fastSimpleUUID()); + wmsProductPutTray.setWorkOrder(workOrder); + wmsProductPutTray.setProductOrder(wmsProductPut.getProductOrder()); + wmsProductPutTray.setWhCode(wmsProductPut.getWhCode()); + wmsProductPutTray.setWaCode(wmsProductPut.getWaCode()); + wmsProductPutTray.setBatchNumber(wmsProductPut.getBatchNumber()); + }else { + throw new ServiceException("该托盘已经被占用！"); + } } return wmsProductPutTrayMapper.insertWmsProductPutTray(wmsProductPutTray); } @@ -135,8 +143,10 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { * 根据托盘号删除接口 */ @Override - @DS("#header.poolName") +// @DS("#header.poolName") public int deleteWmsProductPutTrayBySn(String sn, String workOrder) { + //todo 需要修改 + DynamicDataSourceContextHolder.push("ds_1000"); return wmsProductPutTrayMapper.deleteWmsProductPutTrayBySn(sn,workOrder); } @@ -145,8 +155,11 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { * 手持确认入库批量添加 */ @Override - @DS("#header.poolName") +// @DS("#header.poolName") public int insertWmsProductPutTrays(List wmsProductPutTrays){ + //todo 需要修改 + DynamicDataSourceContextHolder.push("ds_1000"); + ValueOperations valueOperations = redisTemplate.opsForValue(); String workOrder = valueOperations.get("workOrder"); WmsProductPut wmsProductPut = wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); @@ -170,7 +183,7 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews1); }else { //加库存数量 - BigDecimal putQuantity = new BigDecimal(wmsProductPutTray.getNumber()); + BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); wmsFpStorageNews.setAmount(wmsFpStorageNews.getAmount().add(putQuantity)); wmsFpStorageNews.setUpdateBy(SecurityContextHolder.getUserName()); wmsFpStorageNews.setUpdateTime(new Date()); @@ -201,7 +214,7 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { // wmsFpStorageNews.setUpdateTime(new Date()); // wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); // } - //生成库存明细 + //todo 生成库存明细 for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode(wmsProductPut.getProductCode(), wmsProductPutTray.getSn(), wmsProductPutTray.getWlCode()); WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn(); @@ -210,7 +223,7 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { wmsFpStorageNewsSn.setWhCode(wmsProductPut.getWhCode()); wmsFpStorageNewsSn.setWaCode(wmsProductPut.getWaCode()); wmsFpStorageNewsSn.setWlCode(wmsProductPutTray.getWlCode()); - wmsFpStorageNewsSn.setOrderNo(IdUtils.fastSimpleUUID()); +// wmsFpStorageNewsSn.setOrderNo(IdUtils.fastSimpleUUID()); wmsFpStorageNewsSn.setProductName(wmsProductPut.getProductName()); wmsFpStorageNewsSn.setProductCode(wmsProductPut.getProductCode()); wmsFpStorageNewsSn.setSn(wmsProductPutTray.getSn()); @@ -218,6 +231,7 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { wmsFpStorageNewsSn.setAmount(number); wmsFpStorageNewsSn.setCreateBy(SecurityContextHolder.getUserName()); wmsFpStorageNewsSn.setCreateTime(new Date()); + wmsFpStorageNewsSn.setBatchNumber(wmsProductPutTray.getBatchNumber()); wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn); }else { //加库存数量 @@ -251,11 +265,29 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { } //todo 增加托盘上的数量 for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { - WmsProductPutTrayCode wmsProductPutTrayCode = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn(wmsProductPutTray.getSn()); - wmsProductPutTrayCode.setRelatStatus("1"); - wmsProductPutTrayCode.setNumber(wmsProductPutTrayCode.getNumber()+Integer.parseInt(wmsProductPutTray.getNumber())); - wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); + //WmsProductPutTrayCode wmsProductPutTrayCode = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn(wmsProductPutTray.getSn()); + List wmsProductPutTrayCodes = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeBySn1(wmsProductPutTray.getSn()); + for (WmsProductPutTrayCode productPutTrayCode : wmsProductPutTrayCodes) { + productPutTrayCode.setRelatStatus("1"); + productPutTrayCode.setNumber(productPutTrayCode.getNumber()+Integer.parseInt(wmsProductPutTray.getNumber())); + wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(productPutTrayCode); + } +// wmsProductPutTrayCode.setRelatStatus("1"); +// wmsProductPutTrayCode.setNumber(wmsProductPutTrayCode.getNumber()+Integer.parseInt(wmsProductPutTray.getNumber())); +// wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); } return 1; } + + /** + * 根据报工单号查询 + * @param workOrder + * @return + */ + @Override + public List selectWmsProductPutTraysWorkOrder(String workOrder) { + //todo 需要修改 + DynamicDataSourceContextHolder.push("ds_1000"); + return wmsProductPutTrayMapper.selectWmsProductPutTrayByWorkOrder(workOrder); + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml index c209ac2a0..4c73f0a50 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select storage_id, wh_code, wa_code, wl_code, order_no, product_name, product_code, sn, bar_code, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_fp_storage_news_sn + select storage_id, wh_code, wa_code, wl_code, order_no, product_name, product_code, sn, bar_code, amount, batch_number, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_fp_storage_news_sn + + insert into wms_fp_storage_news_sn @@ -120,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sn, bar_code, amount, - user_defined1, + batch_number, user_defined2, user_defined3, user_defined4, @@ -149,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sn}, #{barCode}, #{amount}, - #{userDefined1}, + #{batchNumber}, #{userDefined2}, #{userDefined3}, #{userDefined4}, @@ -181,7 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sn = #{sn}, bar_code = #{barCode}, amount = #{amount}, - user_defined1 = #{userDefined1}, + batch_number = #{batchNumber}, user_defined2 = #{userDefined2}, user_defined3 = #{userDefined3}, user_defined4 = #{userDefined4}, diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml index ffdcd657f..386beab10 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutTrayCodeMapper.xml @@ -59,9 +59,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE barcode = #{barcode} + - + insert into wms_product_put_tray_code storage_id,