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 1648f081..4be9bf6f 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 @@ -6,6 +6,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; +import com.op.system.api.domain.sap.SapMaterialPosting; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -37,6 +38,15 @@ public class OdsProcureOutOrder extends BaseEntity { /** ID */ private String ID; List list; + List sapMaterialPostingList; + + public List getSapMaterialPostingList() { + return sapMaterialPostingList; + } + + public void setSapMaterialPostingList(List sapMaterialPostingList) { + this.sapMaterialPostingList = sapMaterialPostingList; + } public List getList() { return list; 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 543496b2..9fc7a796 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 @@ -2,6 +2,7 @@ package com.op.wms.mapper; import java.util.List; +import com.op.system.api.domain.sap.SapMaterialPosting; import com.op.wms.domain.OdsProcureOutOrder; import org.apache.ibatis.annotations.Param; @@ -75,4 +76,6 @@ public interface OdsProcureOutOrderMapper { List selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1); List selectOdsProcureOutOrderListByu1(@Param("list")List orderList); + + void updateOdsProcureOutOrderByids(@Param("order")OdsProcureOutOrder order,@Param("list") List sapMaterialPostingList); } 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 398228d0..e0ddd583 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 @@ -565,6 +565,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { // List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList); List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByu1(orderList); //查询这个地方先暂时去掉Order_Status = '3' 条件 + List sapMaterialPostingList=new ArrayList<>(); + List orderList2=new ArrayList<>(); for (OdsProcureOutOrder odsProcureOutOrder: orderList1) { //取sap仓库号 @@ -598,7 +600,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder); } }else { - List sapMaterialPostingList=new ArrayList<>(); + SapMaterialPosting sapMaterialPosting =new SapMaterialPosting(); sapMaterialPosting.setAufnr(odsProcureOutOrder.getProduceCode());//订单号 sapMaterialPosting.setBwart("261"); //移动类型 @@ -610,26 +612,29 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { sapMaterialPosting.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位 sapMaterialPosting.setBatch(odsProcureOutOrder.getUserDefined2()); //批号 sapMaterialPostingList.add(sapMaterialPosting); - R result= remoteSapService.sapMaterialPosting(sapMaterialPostingList); - - int code= result.getCode(); - String msg= result.getMsg(); - odsProcureOutOrder.setUserDefined11(msg); - if (code==200){//过账成功 - Map map=new HashMap(); - map= (Map) result.getData(); - String userDefined9= (String) map.get("MATERIALDOCUMENT"); - odsProcureOutOrder.setUserDefined9(userDefined9); - odsProcureOutOrder.setUserDefined10("2");//成功 - odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder); - - }else {// - odsProcureOutOrder.setUserDefined9(""); - odsProcureOutOrder.setUserDefined10("3");//失败 - odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder); - } + orderList2.add(odsProcureOutOrder); + } + } + if (sapMaterialPostingList.size()>0){ + R result= remoteSapService.sapMaterialPosting(sapMaterialPostingList); + OdsProcureOutOrder order =new OdsProcureOutOrder(); + int code= result.getCode(); + String msg= result.getMsg(); + //order.setSapMaterialPostingList(sapMaterialPostingList); + order.setUserDefined11(msg); + if (code==200){//过账成功 + Map map=new HashMap(); + map= (Map) result.getData(); + String userDefined9= (String) map.get("MATERIALDOCUMENT"); + order.setUserDefined9(userDefined9); + order.setUserDefined10("2");//成功 + odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order,orderList2); + + }else {// + order.setUserDefined9(""); + order.setUserDefined10("3");//失败 + odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order,orderList2); } - } } @@ -673,10 +678,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override public void PurchaseOrderdeliPdas(OdsProcureOrder odsProcureOrder) { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - - request.setAttribute("#header.poolName", "ds_" + odsProcureOrder.getFactoryCode()); +// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// +// request.setAttribute("#header.poolName", "ds_" + odsProcureOrder.getFactoryCode()); QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO=new QcCheckTaskIncomeDTO(); + qcCheckTaskIncomeDTO.setPoolName("ds_" + odsProcureOrder.getFactoryCode()); qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); qcCheckTaskIncomeDTO.setCheckManCode("mobile"); 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 2d76839d..4ec516ff 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 @@ -306,6 +306,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" User_Defined11 = #{userDefined11} where ID = #{ID} + + update ods_procure_out_order + set User_Defined10 = #{order.userDefined10}, + User_Defined9 = #{order.userDefined9}, + User_Defined11 = #{order.userDefined11} + where ID in + + #{item.ID} + +