From 66682323f935dc9f5da8277a834d6927046059c0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 24 Sep 2024 18:44:39 +0800 Subject: [PATCH] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OdsProcureOutOrderController.java | 6 ++ .../controller/WmsToWCSmissionController.java | 9 +- .../com/op/wms/domain/OdsProcureOutOrder.java | 19 ++++ .../wms/mapper/OdsProcureOutOrderMapper.java | 5 + .../service/IOdsProcureOutOrderService.java | 4 + .../impl/OdsProcureOrderServiceImpl.java | 6 +- .../impl/OdsProcureOutOrderServiceImpl.java | 57 ++++++++++- .../mapper/wms/OdsProcureOutOrderMapper.xml | 94 ++++++++++++++++++- 8 files changed, 192 insertions(+), 8 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java index 2eaaa8714..4d5e8ee8d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java @@ -134,4 +134,10 @@ public class OdsProcureOutOrderController extends BaseController { String result = odsProcureOutOrderService.addreturnderZC(orderList); return success(result); } + //查询订单要退的物料批次 + @PostMapping("/listReturnBC") + public TableDataInfo listReturnBC( OdsProcureOutOrder odsProcureOutOrder) { + List list = odsProcureOutOrderService.listReturnBC(odsProcureOutOrder); + return getDataTable(list); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index dfe466732..716aecce5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -34,7 +34,8 @@ public class WmsToWCSmissionController { private IOdsProductEmbryoInventoryService odsProductEmbryoInventoryService; @Autowired private IBaseAreaService baseAreaService; - + @Autowired + private IOdsProcureOutOrderService odsProcureOutOrderService; /** * 包材请求入库--- @@ -833,5 +834,11 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.addOrderCardX(orderList); return success(result); } + //退货 + @PostMapping("/listReturnSC") + public AjaxResult listReturn(@RequestBody OdsProcureOutOrder odsProcureOutOrder) { + List list = odsProcureOutOrderService.listReturnSC(odsProcureOutOrder); + return success(list); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 61bc0075d..6344db953 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java @@ -45,6 +45,15 @@ public class OdsProcureOutOrder extends BaseEntity { */ @Excel(name = "工厂编码") private String siteCode; + private BigDecimal qty; + + public BigDecimal getQty() { + return qty; + } + + public void setQty(BigDecimal qty) { + this.qty = qty; + } /** * ID @@ -172,6 +181,16 @@ public class OdsProcureOutOrder extends BaseEntity { */ @Excel(name = "已出库数量") private BigDecimal outNumber; + private BigDecimal returnNumber; + + public BigDecimal getReturnNumber() { + return returnNumber; + } + + public void setReturnNumber(BigDecimal returnNumber) { + this.returnNumber = returnNumber; + } + @Excel(name = "报工数量") private BigDecimal BGNumber; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index aaa94423f..57e93ba2e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -123,6 +123,7 @@ public interface OdsProcureOutOrderMapper { public List selectWmsRawMissionOutByPrdAndMa(OdsProcureOutOrder order1); + public List selectWmsRawMissionOutByPrdAndMaQC(OdsProcureOutOrder order1); public List selectPreDetailHzList(OdsProcureOutOrder odsProcureOutOrder); @@ -133,4 +134,8 @@ public interface OdsProcureOutOrderMapper { List selectMesReportWorkConsumeFC(@Param("userDefined4")String userDefined4,@Param("materialCode")String materialCode); List selectOdsProcureReturnOrderListZC(OdsProcureOutOrder odsProcureOutOrder); + + void insertWmsOdsProcureReturnOrder(OdsProcureOutOrder odsProcureOutOrder1); + + void updateOdsProcureOutOrderByPcAndMc(OdsProcureOutOrder order); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java index 09d3c5226..f5ee10f7c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java @@ -70,4 +70,8 @@ public interface IOdsProcureOutOrderService { List selectOdsProcureReturnOrderListZC(OdsProcureOutOrder odsProcureOutOrder); String addreturnderZC(List orderList); + + List listReturnBC(OdsProcureOutOrder odsProcureOutOrder); + + List listReturnSC(OdsProcureOutOrder odsProcureOutOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index dcd9c6be3..e3a4c0f77 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1914,6 +1914,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override public String addOrderCardX(List orderList) { String factoryCode = orderList.get(0).getFactoryCode(); + String receiptNoCode = orderList.get(0).getReceiptNoCode(); //现在是传了个list标识卡集合 String result1="操作成功"; DynamicDataSourceContextHolder.push("ds_" + factoryCode); @@ -1993,6 +1994,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderInSn.setFactoryCode(order1k.getFactoryCode()); wmsRawOrderInSn.setUserDefined3(order1k.getID()); wmsRawOrderInSn.setUserDefined5(order1k.getReceiptNoCode()); + //wmsRawOrderInSn.setd wmsRawOrderInSn.setUserDefined6(order1k.getUserDefined6());//标识码绑定 wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn); //标识码绑定 @@ -2032,7 +2034,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn(); wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); - wmsRawOrderIn.setDnNo(odsProcureOrder.getReceiptNoCode()); + wmsRawOrderIn.setDnNo(receiptNoCode); wmsRawOrderIn.setPoNo(odsProcureOrder.getProcureCode()); wmsRawOrderIn.setPoLine(odsProcureOrder.getUserDefined3()); wmsRawOrderIn.setMaterialCode(odsProcureOrder.getMaterialCode()); @@ -2049,7 +2051,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderIn.setUserDefined2(MATDOCUMENTYEAR);//年凭证号 wmsRawOrderIn.setUserDefined3(result2.getMsg());//暂收信息 //wmsRawOrderIn.setAccountingMessage(result2.getMsg()); - wmsRawOrderIn.setSapFactoryCode(odsProcureOrder.getFactoryCode()); + wmsRawOrderIn.setSapFactoryCode(factoryCode); wmsRawOrderIn.setCreateBy(odsProcureOrder.getCreateBy()); wmsRawOrderIn.setGmtCreate(new Date()); wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 449a2fc22..5a36506ee 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -3,14 +3,22 @@ package com.op.wms.service.impl; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsProcureOutOrderMapper; import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.service.IOdsProcureOutOrderService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; /** * 包材出库单Service业务层处理 @@ -168,20 +176,61 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService } @Override + @DS("#header.poolName") public String addreturnderZC(List orderList) { //生成退货单，并且在对应的订单上累加加上退货数量 String result="生成退货单成功"; //生成退货单 + // 获取工厂编码 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); //TH ods_procure_order_card + Date date = new Date(); + String formattedDate = dateFormat.format(date); for(OdsProcureOutOrder order:orderList){ + OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); + odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); + odsProcureOutOrder1.setSiteCode(factoryCode); + odsProcureOutOrder1.setProduceCode("TL"+formattedDate); + odsProcureOutOrder1.setReturnNumber(new BigDecimal("0")); + //odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); + odsProcureOutOrder1.setMaterialCode(order.getMaterialCode()); + odsProcureOutOrder1.setMaterialDesc(order.getMaterialDesc()); + odsProcureOutOrder1.setPlanDate(new Date()); + odsProcureOutOrder1.setUnit(order.getUnit()); - - - + odsProcureOutOrder1.setActive("1"); + odsProcureOutOrder1.setOrderStatus("1");// + odsProcureOutOrder1.setPlanNumber(order.getQty()); + //odsProcureOutOrder1.setUserDefined2(order.getUserDefined2()); + if(order.getProduceCode().length()<=11){ + odsProcureOutOrder1.setUserDefined3("X");//反冲 + }else { + odsProcureOutOrder1.setUserDefined3(""); + } + odsProcureOutOrder1.setUserDefined4(order.getProduceCode()); + odsProcureOutOrder1.setUserDefined10("1"); + odsProcureOutOrder1.setCreateBy(SecurityUtils.getUsername()); + odsProcureOutOrder1.setCreateDate(new Date()); + odsProcureOutOrderMapper.insertWmsOdsProcureReturnOrder(odsProcureOutOrder1); + odsProcureOutOrderMapper.updateOdsProcureOutOrderByPcAndMc(order); } + return result; + } + @Override + @DS("#header.poolName") + public List listReturnBC(OdsProcureOutOrder odsProcureOutOrder) { + List list= odsProcureOutOrderMapper.selectWmsRawMissionOutByPrdAndMaQC(odsProcureOutOrder); + return list; + } - return null; + @Override + public List listReturnSC(OdsProcureOutOrder odsProcureOutOrder) { + DynamicDataSourceContextHolder.push("ds_" + odsProcureOutOrder.getFactoryCode()); + List orderList = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(odsProcureOutOrder); + return orderList; } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 2da0c3f3f..1e648fdc1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -42,6 +42,7 @@ + limit #{page.pageOffset} , #{page.rows} @@ -343,6 +344,11 @@ where ID = #{ID} + + update wms_ods_procure_return_order + set Return_Number = COALESCE(Return_Number, 0) + #{qty} + where Produce_Code = #{ID} and Material_Code=#{materialCode} + delete from ods_procure_out_order where ID = #{ID} @@ -1063,6 +1069,16 @@ prd_order=#{produceCode} AND material_code=#{materialCode} + +