Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wws 1 year ago
parent f92177941b d1e62a3d70
commit 85ce59cd8a
4 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File

10
op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java
Unescape Escape View File

@ -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<OdsProcureOutOrder> list;
List<SapMaterialPosting> sapMaterialPostingList;
public List<SapMaterialPosting> getSapMaterialPostingList() {
return sapMaterialPostingList;
}
public void setSapMaterialPostingList(List<SapMaterialPosting> sapMaterialPostingList) {
this.sapMaterialPostingList = sapMaterialPostingList;
}
public List<OdsProcureOutOrder> getList() {
return list;

3
op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java
Unescape Escape View File

@ -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<OdsProcureOutOrder> selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListByu1(@Param("list")List<OdsProcureOutOrder> orderList);
void updateOdsProcureOutOrderByids(@Param("order")OdsProcureOutOrder order,@Param("list") List<OdsProcureOutOrder> sapMaterialPostingList);
}

34
op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
Unescape Escape View File

@ -565,6 +565,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
// List<OdsProcureOutOrder> orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList);
List<OdsProcureOutOrder> orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByu1(orderList);
//查询这个地方先暂时去掉Order_Status = '3' 条件
List<SapMaterialPosting> sapMaterialPostingList=new ArrayList<>();
List<OdsProcureOutOrder> orderList2=new ArrayList<>();
for (OdsProcureOutOrder odsProcureOutOrder:
orderList1) {
//取ｓａｐ仓库号
@ -598,7 +600,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder);
}
}else {
List<SapMaterialPosting> sapMaterialPostingList=new ArrayList<>();
SapMaterialPosting sapMaterialPosting =new SapMaterialPosting();
sapMaterialPosting.setAufnr(odsProcureOutOrder.getProduceCode());//订单号
sapMaterialPosting.setBwart("261"); //移动类型
@ -610,30 +612,33 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
sapMaterialPosting.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位
sapMaterialPosting.setBatch(odsProcureOutOrder.getUserDefined2()); //批号
sapMaterialPostingList.add(sapMaterialPosting);
orderList2.add(odsProcureOutOrder);
}
}
if (sapMaterialPostingList.size()>0){
R result= remoteSapService.sapMaterialPosting(sapMaterialPostingList);
OdsProcureOutOrder order =new OdsProcureOutOrder();
int code= result.getCode();
String msg= result.getMsg();
odsProcureOutOrder.setUserDefined11(msg);
//order.setSapMaterialPostingList(sapMaterialPostingList);
order.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);
order.setUserDefined9(userDefined9);
order.setUserDefined10("2");//成功
odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order,orderList2);
}else {//
odsProcureOutOrder.setUserDefined9("");
odsProcureOutOrder.setUserDefined10("3");//失败
odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder);
order.setUserDefined9("");
order.setUserDefined10("3");//失败
odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order,orderList2);
}
}
}
}
@Override
public AjaxResult sapPurchaseOrderSync(OdsProcureOrder odsProcureOrder) {
DynamicDataSourceContextHolder.push("ds_" +odsProcureOrder.getFactoryCode());
@ -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");

11
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
Unescape Escape View File

@ -306,6 +306,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
User_Defined11 = #{userDefined11}
where ID = #{ID}
</update>
<update id="updateOdsProcureOutOrderByids">
update ods_procure_out_order
set User_Defined10 = #{order.userDefined10},
User_Defined9 = #{order.userDefined9},
User_Defined11 = #{order.userDefined11}
where ID in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.ID}
</foreach>
</update>
<select id="selectOdsProcureOutOrderListByIds" resultMap="OdsProcureOutOrderResult">
<include refid="selectOdsProcureOutOrderVo"/>
WHERE
@ -351,6 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
Active,
Enterprise_Id,
Enterprise_Code
from ods_procure_out_order
WHERE
<![CDATA[ (User_Defined10 <> '2' OR User_Defined10 is NULL ) ]]>
and Produce_Code in

Write Preview
Loading…
Cancel
Save