|
|
|
@ -616,14 +616,14 @@ public class CtqyyClient extends CommonHttpClient {
|
|
|
|
|
//提交到第三方系统
|
|
|
|
|
if (thrSystemBusApiEntity.getUrl().equals("saveMasterialInput")) {
|
|
|
|
|
// //采购入库单据
|
|
|
|
|
// if (vailHightMaterial(detailBizEntities.get(0))) {
|
|
|
|
|
// zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
|
|
|
|
|
// UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
|
|
|
|
|
// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
|
|
|
|
|
// } else {
|
|
|
|
|
// zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
|
|
|
|
|
// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
|
|
|
|
|
// }
|
|
|
|
|
if (vailHightMaterial(detailBizEntities.get(0))) {
|
|
|
|
|
zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
|
|
|
|
|
UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
|
|
|
|
|
zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
|
|
|
|
|
} else {
|
|
|
|
|
zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
|
|
|
|
|
zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
|
|
|
|
|
}
|
|
|
|
|
Boolean b = sysParamConfigService.selectByKey("ct_split_groupbuy");
|
|
|
|
|
if (b) {
|
|
|
|
|
Map<String, List<UdiwmsOrderDetailRequest>> splitMap = items.stream()
|
|
|
|
@ -677,10 +677,8 @@ public class CtqyyClient extends CommonHttpClient {
|
|
|
|
|
*/
|
|
|
|
|
public boolean vailHightMaterial(IoOrderDetailBizEntity orderDetailBizEntity) {
|
|
|
|
|
BasicUdirelEntity basicUdirel = basicUdirelDao.selectById(orderDetailBizEntity.getBindRlFk());
|
|
|
|
|
BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new QueryWrapper<BasicProductsEntity>().eq("uuid", basicUdirel.getUuid()).last("limit 1"));
|
|
|
|
|
if (basicProductsEntity != null &&
|
|
|
|
|
(StrUtil.trimToEmpty(basicProductsEntity.getBasicPrductRemak7()).equals("1101")
|
|
|
|
|
|| StrUtil.trimToEmpty(basicProductsEntity.getBasicPrductRemak7()).equals("3601"))) {
|
|
|
|
|
// BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new QueryWrapper<BasicProductsEntity>().eq("uuid", basicUdirel.getUuid()).last("limit 1"));
|
|
|
|
|
if (basicUdirel != null && IntUtil.value(basicUdirel.getHcType()) == 1) {
|
|
|
|
|
return true;
|
|
|
|
|
} else
|
|
|
|
|
return false;
|
|
|
|
|