|
|
|
@ -1,6 +1,8 @@
|
|
|
|
|
package jnpf.controller;
|
|
|
|
|
|
|
|
|
|
import baiduUtils.BeanUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
|
@ -11,11 +13,13 @@ import jnpf.engine.service.FlowTaskNodeService;
|
|
|
|
|
import jnpf.engine.service.FlowTaskService;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.model.yunguan.YunguanPurchaseInBoundModel;
|
|
|
|
|
import jnpf.model.yunguan.YunguanPurchaseOrderProductModel;
|
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.model.warehousingstorage.*;
|
|
|
|
|
import jnpf.util.wxutil.HttpUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.ibatis.jdbc.Null;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
@ -731,9 +735,16 @@ public class WarehousingStorageController {
|
|
|
|
|
}
|
|
|
|
|
if (entity.getWarehousingStorageType().equals("1")){
|
|
|
|
|
YunguanPurchaseInBoundModel yunguanPurchaseInBoundModel = warehousingStorageService.purchaseInBoundByYunGuan(id);
|
|
|
|
|
List<YunguanPurchaseInBoundModel> yunguanPurchaseProductInBoundModel = warehousingStorageService.purchaseInBoundProductByYunGuanInfo(id);
|
|
|
|
|
for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModel){
|
|
|
|
|
|
|
|
|
|
List<YunguanPurchaseInBoundModel> yunguanPurchaseProductInBoundModelList = warehousingStorageService.purchaseInBoundProductByYunGuanInfo(id);
|
|
|
|
|
for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){
|
|
|
|
|
BeanUtil.merge(model,yunguanPurchaseInBoundModel);
|
|
|
|
|
}
|
|
|
|
|
if (yunguanPurchaseProductInBoundModelList != null && yunguanPurchaseProductInBoundModelList.size()>0) {
|
|
|
|
|
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseProductInBoundModelList));
|
|
|
|
|
if (ObjectUtil.isNotEmpty(purchaseCode)){
|
|
|
|
|
if (purchaseCode.get("code").equals("200")) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|