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 c8801729..57fd6a91 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 @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.uuid.IdUtils; +import com.op.wms.service.IOdsProcureOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +25,7 @@ import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.page.TableDataInfo; /** - * 包材出库单Controller + * 包材出库单Controllers * * @author Open Platform * @date 2023-07-06 @@ -34,7 +35,8 @@ import com.op.common.core.web.page.TableDataInfo; public class OdsProcureOutOrderController extends BaseController { @Autowired private IOdsProcureOutOrderService odsProcureOutOrderService; - + @Autowired + private IOdsProcureOrderService odsProcureOrderService; /** * 查询包材出库单列表 */ @@ -174,4 +176,15 @@ public class OdsProcureOutOrderController extends BaseController { String result = odsProcureOutOrderService.addwmsFpStorageNewsTS(orderList); return success(result); } + /** + * 退货过账 + * + * @param orderList + * @return + */ + @PostMapping("/OutboundPostingzcSAPTH") + public AjaxResult OutboundPostingzcSAPTH(@RequestBody List orderList) { + odsProcureOrderService.OutboundPostingzcSAPTH(orderList); + return success(); + } } 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 05b43bed..512c5433 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 @@ -1674,6 +1674,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } @Override + @DS("#header.poolName") public void OutboundPostingzcSAPTH(List orderList) { //先根据出库单获取 // * 退料的移动类型为 262 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 e8775496..1dd22b55 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 @@ -241,7 +241,10 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService @DS("#header.poolName") public List listReturnDY(OdsProcureOutOrder odsProcureOutOrder) { List orderList = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(odsProcureOutOrder); - return orderList; + OdsProcureOutOrder order=new OdsProcureOutOrder(); + order.setProduceCode(orderList.get(0).getProduceCode()); + List odsProcureOutOrders = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(order); + return odsProcureOutOrders; } //特殊出库 @Override 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 e7472e85..bc9edfd4 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 @@ -1472,6 +1472,7 @@ and Active = #{Active} and Enterprise_Id = #{enterpriseId} and Enterprise_Code = #{enterpriseCode} + and ID = #{ID} ORDER BY User_Defined4 DESC