|
|
|
@ -64,6 +64,7 @@ import org.springframework.beans.BeanUtils; |
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
import java.text.DecimalFormat; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @author :杨士勇 |
|
|
|
@ -3537,6 +3538,9 @@ public class BeanTransitionUtils { |
|
|
|
|
if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){ |
|
|
|
|
ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL()); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotBlank(req.getZSNYX())){ |
|
|
|
|
ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey()); |
|
|
|
|
} |
|
|
|
|
ddtxxBO.setGSDM(req.getBUKRS()); |
|
|
|
|
ddtxxBO.setENTID(deptEntity.getDeptId()); |
|
|
|
|
ddtxxBO.setBHZT(ConfigureConstant.STRING_0); |
|
|
|
@ -3630,9 +3634,26 @@ public class BeanTransitionUtils { |
|
|
|
|
ddtxxBO.setHJSE("0"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
ddzxxBO.setDDTXX(ddtxxBO); |
|
|
|
|
ddzxxBO.setDDMXXX(ddmxList); |
|
|
|
|
ddzxxList.add(ddzxxBO); |
|
|
|
|
|
|
|
|
|
//如果是山能易行按照物料编码分组拆分订单
|
|
|
|
|
if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){ |
|
|
|
|
Map<String, List<DdmxxxBO>> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); |
|
|
|
|
for (int i = 0; i < collect.size(); i++) { |
|
|
|
|
DdzxxBO ddzxxBONew = new DdzxxBO(); |
|
|
|
|
DdtxxBO ddtxxBONew = new DdtxxBO(); |
|
|
|
|
List<DdmxxxBO> ddmxLists = new ArrayList<>(); |
|
|
|
|
BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); |
|
|
|
|
ddmxLists.addAll(collect.get(i)); |
|
|
|
|
|
|
|
|
|
ddzxxBONew.setDDTXX(ddtxxBO); |
|
|
|
|
ddzxxBONew.setDDMXXX(ddmxList); |
|
|
|
|
ddzxxList.add(ddzxxBONew); |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
ddzxxBO.setDDTXX(ddtxxBO); |
|
|
|
|
ddzxxBO.setDDMXXX(ddmxList); |
|
|
|
|
ddzxxList.add(ddzxxBO); |
|
|
|
|
} |
|
|
|
|
ddpcxxReqBO.setDDPCXX(ddpcxxBO); |
|
|
|
|
ddpcxxReqBO.setDDZXX(ddzxxList); |
|
|
|
|
log.info("转换后的DdpcxxReqBO:{}", JSONObject.toJSONString(ddpcxxReqBO)); |
|
|
|
|