yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口修改

Browse Source
jg-waiwang-pro
vayne 3 months ago
parent eb928cb4e4
commit fcf071d51e
13 changed files with 505 additions and 69 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
Unescape View File

@ -99,6 +99,8 @@
<result column="realName" property="realName"/>
<result column="realNameA" property="realNameA"/>
<result column="taxCount" property="taxCount"/>
<result column="erp_mark" property="erpMark"/>
<result column="erp_massage" property="erpMassage"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
@ -171,6 +173,8 @@
<result column="purchaseStatus" property="purchaseStatus"/>
<result column="wareHouseName" property="wareHouseName"/>
<result column="addressName" property="addressName"/>
<result column="erp_mark" property="erpMark"/>
<result column="erp_massage" property="erpMassage"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>

2
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
Unescape View File

@ -34,6 +34,8 @@
<result column="realName" property="realName"/>
<result column="realNameA" property="realNameA"/>
<result column="settlement_sum" property="settlementSum"/>
<result column="erp_mark" property="erpMark"/>
<result column="erp_massage" property="erpMassage"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>

2
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
Unescape View File

@ -21,6 +21,8 @@
<result column="realName" property="realName"/>
<result column="realNameA" property="realNameA"/>
<result column="outNumber" property="outNumber"/>
<result column="erp_mark" property="erpMark"/>
<result column="erp_massage" property="erpMassage"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>

2
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
Unescape View File

@ -21,6 +21,8 @@
<result column="realNameA" property="realNameA"/>
<result column="realityNumber" property="realityNumber"/>
<result column="business_order_no" property="businessOrderNo"/>
<result column="erp_mark" property="erpMark"/>
<result column="erp_massage" property="erpMassage"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>

2
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
Unescape View File

@ -45,6 +45,8 @@
<result column="productCode" property="productCode"></result>
<result column="unitId" property="unitId"></result>
<result column="proportionNum" property="proportionNum"></result>
<result column="erp_mark" property="erpMark"/>
<result column="erp_massage" property="erpMassage"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>

104
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
Unescape View File

@ -1494,52 +1494,128 @@ public class BusinessOrderController {
if (type.equals("1")){ //采购订单接口
YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(purchaseOrder)) {
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
if (ObjectUtil.isNotEmpty(purchaseCode) && purchaseCode.get("code").equals("200")){
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")){
List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
if(ObjectUtil.isNotEmpty(purchaseProductCode) && purchaseProductCode.get("code").equals("200")){
if (ObjectUtil.isNotEmpty(purchaseProductCode)) {
if (purchaseProductCode.get("code").equals("200")) {
businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
businessOrderEntity.setErpMassage(purchaseCode.get("errmsg").toString());
businessOrderService.updateById(businessOrderEntity);
return ActionResult.success("推送成功");
}else{
businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
businessOrderEntity.setErpMassage(purchaseCode.get("errmsg").toString());
businessOrderService.updateById(businessOrderEntity);
return ActionResult.success("推送采购订单行失败");
}
} else {
businessOrderEntity.setErpMark("N");
businessOrderEntity.setErpMassage("ESB返回为空");
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送采购订单行失败");
}
}else{
businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
businessOrderEntity.setErpMassage(purchaseCode.get("errmsg").toString());
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送采购订单头失败");
}
}else{
businessOrderEntity.setErpMark("N");
businessOrderEntity.setErpMassage("ESB返回为空");
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送采购订单头失败");
}
}
}else if (type.equals("2")){ //销售订单接口
YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(saleOrder)){
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id);
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")) {
if (ObjectUtil.isNotEmpty(saleCode)) {
if (saleCode.get("code").equals("200")) {
List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
if (ObjectUtil.isNotEmpty(saleProductCode) && saleProductCode.get("code").equals("200")){
if (ObjectUtil.isNotEmpty(saleProductCode)) {
if (saleProductCode.get("code").equals("200")) {
businessOrderEntity.setErpMark(saleCode.get("code").toString());
businessOrderEntity.setErpMassage(saleCode.get("errmsg").toString());
businessOrderService.updateById(businessOrderEntity);
return ActionResult.success("推送成功");
}else{
businessOrderEntity.setErpMark(saleCode.get("code").toString());
businessOrderEntity.setErpMassage(saleCode.get("errmsg").toString());
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送销售订单行失败");
}
} else {
businessOrderEntity.setErpMark("N");
businessOrderEntity.setErpMassage("ESB返回为空");
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送销售订单行失败");
}
}else{
businessOrderEntity.setErpMark(saleCode.get("code").toString());
businessOrderEntity.setErpMassage(saleCode.get("errmsg").toString());
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送销售订单头失败");
}
}else{
businessOrderEntity.setErpMark("N");
businessOrderEntity.setErpMassage("ESB返回为空");
businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送销售订单头失败");
}
}
} else if (type.equals("3")) { //采购入库接口
List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getInfo(id);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
if (ObjectUtil.isNotEmpty(purchaseCode) && purchaseCode.get("code").equals("200")){
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
warehousingStorageEntity.setErpMark(purchaseCode.get("code").toString());
warehousingStorageEntity.setErpMassage(purchaseCode.get("errmsg").toString());
warehousingStorageService.updateById(warehousingStorageEntity);
return ActionResult.success("推送成功");
}else{
warehousingStorageEntity.setErpMark(purchaseCode.get("code").toString());
warehousingStorageEntity.setErpMassage(purchaseCode.get("errmsg").toString());
warehousingStorageService.updateById(warehousingStorageEntity);
return ActionResult.fail("推送失败");
}
}else{
warehousingStorageEntity.setErpMark("N");
warehousingStorageEntity.setErpMassage("ESB返回为空");
warehousingStorageService.updateById(warehousingStorageEntity);
return ActionResult.fail("推送失败");
}
}
} else if (type.equals("4")) { //销售出库接口
List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(id);
if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
WarehousingOutboundEntity warehousingOutboundEntity = warehousingOutboundService.getInfo(id);
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")){
if (ObjectUtil.isNotEmpty(saleCode)){
if (saleCode.get("code").equals("200")) {
warehousingOutboundEntity.setErpMark(saleCode.get("code").toString());
warehousingOutboundEntity.setErpMassage(saleCode.get("errmsg").toString());
warehousingOutboundService.updateById(warehousingOutboundEntity);
return ActionResult.success("推送成功");
}else{
warehousingOutboundEntity.setErpMark(saleCode.get("code").toString());
warehousingOutboundEntity.setErpMassage(saleCode.get("errmsg").toString());
warehousingOutboundService.updateById(warehousingOutboundEntity);
return ActionResult.fail("推送失败");
}
}else{
warehousingOutboundEntity.setErpMark("N");
warehousingOutboundEntity.setErpMassage("ESB返回为空");
warehousingOutboundService.updateById(warehousingOutboundEntity);
return ActionResult.fail("推送失败");
}
}
@ -1547,10 +1623,24 @@ public class BusinessOrderController {
List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
WorkOrderEntity workOrderEntity = workOrderService.getInfo(id);
JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
if (ObjectUtil.isNotEmpty(workOrderCode)){
if (workOrderCode.get("code").equals("200")) {
workOrderEntity.setErpMark(workOrderCode.get("code").toString());
workOrderEntity.setErpMassage(workOrderCode.get("errmsg").toString());
workOrderService.updateById(workOrderEntity);
return ActionResult.success("推送成功");
}else{
workOrderEntity.setErpMark(workOrderCode.get("code").toString());
workOrderEntity.setErpMassage(workOrderCode.get("errmsg").toString());
workOrderService.updateById(workOrderEntity);
return ActionResult.fail("推送失败");
}
}else{
workOrderEntity.setErpMark("N");
workOrderEntity.setErpMassage("ESB返回为空");
workOrderService.updateById(workOrderEntity);
return ActionResult.fail("推送失败");
}
} else if (type.equals("6")) { //采购结算接口

383
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
Unescape View File

@ -32,6 +32,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* Inventory
@ -823,12 +824,41 @@ public class YunguanInterfaceController {
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanPurchaseOrderModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
if (ObjectUtil.isNotEmpty(businessOrderEntity) && yunguanPurchaseOrderModel.getREAD_FLAG().equals("N")){
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
//更新运管标志
String purchaseNo = yunguanPurchaseOrderModel.getORD_NO();
boolean inBoundNoExists = redisUtil.exists(purchaseNo);
if (inBoundNoExists){
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
long count = businessOrderProductRelationalService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(purchaseNo);
List<Object> objList = redisUtil.get(purchaseNo,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanPurchaseOrderModel.getREAD_FLAG());
redisUtil.remove(purchaseNo);
redisUtil.insert(purchaseNo,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
redisUtil.remove(purchaseNo);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseOrderModel.getREAD_FLAG()));
redisUtil.insert(purchaseNo, list);
}
}
} else if (jsonObject.get("TYPE").equals("采购订单行")) {
YunguanPurchaseOrderProductModel yunguanPurchaseOrderProductModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderProductModel.class);
@ -853,6 +883,35 @@ public class YunguanInterfaceController {
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
//更新运管标志
String purchaseNo = yunguanPurchaseOrderProductModel.getORD_NO();
boolean inBoundNoExists = redisUtil.exists(purchaseNo);
if (inBoundNoExists){
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
long count = businessOrderProductRelationalService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(purchaseNo);
List<Object> objList = redisUtil.get(purchaseNo,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanPurchaseOrderProductModel.getREAD_FLAG());
redisUtil.remove(purchaseNo);
redisUtil.insert(purchaseNo,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderProductModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderProductModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
redisUtil.remove(purchaseNo);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseOrderProductModel.getREAD_FLAG()));
redisUtil.insert(purchaseNo, list);
}
}
}
} else if (jsonObject.get("TYPE").equals("销售订单头")) {
@ -861,12 +920,41 @@ public class YunguanInterfaceController {
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanSaleOrderModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
if (ObjectUtil.isNotEmpty(businessOrderEntity) && yunguanSaleOrderModel.getREAD_FLAG().equals("N")){
businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
//更新运管标志
String saleNo = yunguanSaleOrderModel.getORD_NO();
boolean inBoundNoExists = redisUtil.exists(saleNo);
if (inBoundNoExists){
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
long count = businessOrderProductRelationalService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(saleNo);
List<Object> objList = redisUtil.get(saleNo,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanSaleOrderModel.getREAD_FLAG());
redisUtil.remove(saleNo);
redisUtil.insert(saleNo,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
redisUtil.remove(saleNo);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleOrderModel.getREAD_FLAG()));
redisUtil.insert(saleNo, list);
}
}
} else if (jsonObject.get("TYPE").equals("销售订单行")) {
YunguanSaleOrderProductModel yunguanSaleOrderProductModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderProductModel.class);
@ -891,6 +979,35 @@ public class YunguanInterfaceController {
businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
//更新运管标志
String saleNo = yunguanSaleOrderProductModel.getORD_NO();
boolean inBoundNoExists = redisUtil.exists(saleNo);
if (inBoundNoExists){
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
long count = businessOrderProductRelationalService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(saleNo);
List<Object> objList = redisUtil.get(saleNo,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanSaleOrderProductModel.getREAD_FLAG());
redisUtil.remove(saleNo);
redisUtil.insert(saleNo,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
businessOrderEntity.setYunguanMark(yunguanSaleOrderProductModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanSaleOrderProductModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
redisUtil.remove(saleNo);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleOrderProductModel.getREAD_FLAG()));
redisUtil.insert(saleNo, list);
}
}
}
} else if (jsonObject.get("TYPE").equals("采购入库")) {
@ -900,20 +1017,36 @@ public class YunguanInterfaceController {
warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,yunguanPurchaseInBoundModel.getRECEIPT_NO());
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageEntity)){
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*",""));
WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){
warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageProductService.updateById(warehousingStorageProductEntity);
if (yunguanPurchaseInBoundModel.getREAD_FLAG().equals("N")){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
//更新运管标志
String inBound = yunguanPurchaseInBoundModel.getRECEIPT_NO();
boolean inBoundNoExists = redisUtil.exists(inBound);
if (inBoundNoExists){
QueryWrapper<WarehousingStorageProductEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
countQueryWrapper.lambda().isNull(WarehousingStorageProductEntity::getDeleteMark);
long count = warehousingStorageProductService.count(countQueryWrapper); //入库单子表size
String s = redisUtil.getString(inBound).toString();
List<String> list = Arrays.asList(s.split(","));
long lenght = list.size();
if (lenght < count){
long size = redisUtil.getListSize(inBound);
List<Object> objList = redisUtil.get(inBound,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanPurchaseInBoundModel.getREAD_FLAG());
redisUtil.remove(inBound);
redisUtil.insert(inBound,list);
}else if (lenght == count){
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
@ -921,29 +1054,11 @@ public class YunguanInterfaceController {
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
redisUtil.remove(inBound);
}
}else {
redisUtil.insert(inBound, yunguanPurchaseInBoundModel.getREAD_FLAG());
}
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*",""));
WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){
warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageProductService.updateById(warehousingStorageProductEntity);
if (StringUtils.isEmpty(warehousingStorageEntity.getYunguanMark())){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
} else if (warehousingStorageEntity.getYunguanMark().equals("Y")) {
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseInBoundModel.getREAD_FLAG()));
redisUtil.insert(inBound, list);
}
}
}
@ -964,17 +1079,40 @@ public class YunguanInterfaceController {
warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundProductService.updateById(warehousingOutboundProductEntity);
if (StringUtils.isEmpty(warehousingOutboundEntity.getYunguanMark())){
if (yunguanSaleOutBoundModel.getREAD_FLAG().equals("N")){
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundService.updateById(warehousingOutboundEntity);
}else if(warehousingOutboundEntity.getYunguanMark().equals("Y")){
}
//更新运管标志
String outBound = yunguanSaleOutBoundModel.getPROD_ZL();
boolean inBoundNoExists = redisUtil.exists(outBound);
if (inBoundNoExists){
QueryWrapper<WarehousingOutboundProductEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId,warehousingOutboundEntity.getId());
countQueryWrapper.lambda().isNull(WarehousingOutboundProductEntity::getDeleteMark);
long count = warehousingOutboundProductService.count(countQueryWrapper); //入库单子表size
long size = redisUtil.getListSize(outBound);
List<Object> objList = redisUtil.get(outBound,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanSaleOutBoundModel.getREAD_FLAG());
redisUtil.remove(outBound);
redisUtil.insert(outBound,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundService.updateById(warehousingOutboundEntity);
}
redisUtil.remove(outBound);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleOutBoundModel.getREAD_FLAG()));
redisUtil.insert(outBound, list);
}
}
}
}
@ -984,12 +1122,41 @@ public class YunguanInterfaceController {
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanPurchaseSettlementModel.getACCOUNT_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
if (ObjectUtil.isNotEmpty(cwsettlementEntity) && yunguanPurchaseSettlementModel.getREAD_FLAG().equals("N")){
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
//更新运管标志
String purSettlement = yunguanPurchaseSettlementModel.getACCOUNT_NO();
boolean inBoundNoExists = redisUtil.exists(purSettlement);
if (inBoundNoExists){
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
long count = cwsettlementsummaryService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(purSettlement);
List<Object> objList = redisUtil.get(purSettlement,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanPurchaseSettlementModel.getREAD_FLAG());
redisUtil.remove(purSettlement);
redisUtil.insert(purSettlement,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
redisUtil.remove(purSettlement);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseSettlementModel.getREAD_FLAG()));
redisUtil.insert(purSettlement, list);
}
}
} else if (jsonObject.get("TYPE").equals("采购结算行")) {
YunguanPurchaseSettlementProductModel yunguanPurchaseSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementProductModel.class);
@ -1014,6 +1181,35 @@ public class YunguanInterfaceController {
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
//更新运管标志
String purSettlement = yunguanPurchaseSettlementProductModel.getACCOUNT_NO();
boolean inBoundNoExists = redisUtil.exists(purSettlement);
if (inBoundNoExists){
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
long count = cwsettlementsummaryService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(purSettlement);
List<Object> objList = redisUtil.get(purSettlement,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanPurchaseSettlementProductModel.getREAD_FLAG());
redisUtil.remove(purSettlement);
redisUtil.insert(purSettlement,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementProductModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementProductModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
redisUtil.remove(purSettlement);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseSettlementProductModel.getREAD_FLAG()));
redisUtil.insert(purSettlement, list);
}
}
}
} else if (jsonObject.get("TYPE").equals("销售结算头")) {
@ -1022,12 +1218,41 @@ public class YunguanInterfaceController {
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementModel.getINVOICE_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
if (ObjectUtil.isNotEmpty(cwsettlementEntity) && yunguanSaleSettlementModel.getREAD_FLAG().equals("N")){
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
//更新运管标志
String salSettlement = yunguanSaleSettlementModel.getINVOICE_NO();
boolean inBoundNoExists = redisUtil.exists(salSettlement);
if (inBoundNoExists){
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
long count = cwsettlementsummaryService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(salSettlement);
List<Object> objList = redisUtil.get(salSettlement,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanSaleSettlementModel.getREAD_FLAG());
redisUtil.remove(salSettlement);
redisUtil.insert(salSettlement,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
redisUtil.remove(salSettlement);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleSettlementModel.getREAD_FLAG()));
redisUtil.insert(salSettlement, list);
}
}
} else if (jsonObject.get("TYPE").equals("销售结算行")) {
YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanSaleSettlementProductModel.class);
@ -1055,6 +1280,35 @@ public class YunguanInterfaceController {
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
//更新运管标志
String salSettlement = yunguanSaleSettlementProductModel.getINVOICE_NO();
boolean inBoundNoExists = redisUtil.exists(salSettlement);
if (inBoundNoExists){
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
long count = cwsettlementsummaryService.count(countQueryWrapper);
count++;
long size = redisUtil.getListSize(salSettlement);
List<Object> objList = redisUtil.get(salSettlement,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanSaleSettlementProductModel.getREAD_FLAG());
redisUtil.remove(salSettlement);
redisUtil.insert(salSettlement,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
redisUtil.remove(salSettlement);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleSettlementProductModel.getREAD_FLAG()));
redisUtil.insert(salSettlement, list);
}
}
}
}
@ -1064,11 +1318,16 @@ public class YunguanInterfaceController {
QueryWrapper<WorkOrderEntity> workOrderQueryWrapper = new QueryWrapper<>();
workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO());
WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper);
QueryWrapper<WorkOrderPrimaryEntity> countPrimaryQueryWrapper = new QueryWrapper<>();
countPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId());
countPrimaryQueryWrapper.lambda().isNull(WorkOrderPrimaryEntity::getDeleteMark);
long countPrimary = workOrderPrimaryService.count(countPrimaryQueryWrapper);
QueryWrapper<WorkOrderProductEntity> countProductQueryWrapper = new QueryWrapper<>();
countProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId());
countProductQueryWrapper.lambda().isNull(WorkOrderProductEntity::getDeleteMark);
long countProduct = workOrderProductService.count(countProductQueryWrapper);
long count = countPrimary+countProduct;
if (ObjectUtil.isNotEmpty(workOrderEntity)){
// QueryWrapper<ProductWarehouseEntity> productQueryWrapper = new QueryWrapper<>();
// productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD());
// productQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
// ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper);
if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("投入")){
QueryWrapper<WorkOrderPrimaryEntity> workOrderPrimaryQueryWrapper = new QueryWrapper<>();
workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId());
@ -1079,11 +1338,37 @@ public class YunguanInterfaceController {
workOrderPrimaryEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderPrimaryEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderPrimaryService.updateById(workOrderPrimaryEntity);
if (yunguanProductProcessModel.getREAD_FLAG().equals("N")) {
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderService.updateById(workOrderEntity);
}
//更新运管标志
String taskNo = yunguanProductProcessModel.getTASK_NO();
boolean inBoundNoExists = redisUtil.exists(taskNo);
if (inBoundNoExists){
long size = redisUtil.getListSize(taskNo);
List<Object> objList = redisUtil.get(taskNo,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanProductProcessModel.getREAD_FLAG());
redisUtil.remove(taskNo);
redisUtil.insert(taskNo,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderService.updateById(workOrderEntity);
}
redisUtil.remove(taskNo);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanProductProcessModel.getREAD_FLAG()));
redisUtil.insert(taskNo, list);
}
}
} else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) {
QueryWrapper<WorkOrderProductEntity> workOrderProductQueryWrapper = new QueryWrapper<>();
workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId());
@ -1094,11 +1379,37 @@ public class YunguanInterfaceController {
workOrderProductEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderProductEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderProductService.updateById(workOrderProductEntity);
if (yunguanProductProcessModel.getREAD_FLAG().equals("N")) {
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderService.updateById(workOrderEntity);
}
//更新运管标志
String taskNo = yunguanProductProcessModel.getTASK_NO();
boolean inBoundNoExists = redisUtil.exists(taskNo);
if (inBoundNoExists){
long size = redisUtil.getListSize(taskNo);
List<Object> objList = redisUtil.get(taskNo,0,size);
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
list.add(yunguanProductProcessModel.getREAD_FLAG());
redisUtil.remove(taskNo);
redisUtil.insert(taskNo,list);
if (list.size() == count){
boolean dis = list.stream().distinct().count() <= 1;
if (dis){
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderService.updateById(workOrderEntity);
}
redisUtil.remove(taskNo);
}
}else {
List<String> list = new ArrayList<>(Collections.singleton(yunguanProductProcessModel.getREAD_FLAG()));
redisUtil.insert(taskNo, list);
}
}
}
}
}

5
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
Unescape View File

@ -178,7 +178,10 @@
<el-table-column prop="realNameA" label="修改用户" align="center">
</el-table-column>
<el-table-column prop="erpMark" label="上传运管状态" align="center" width="100">
</el-table-column>
<el-table-column prop="erpMassage" label="上传运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">

4
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
Unescape View File

@ -219,6 +219,10 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="erpMark" label="上传运管状态" align="center" width="100">
</el-table-column>
<el-table-column prop="erpMassage" label="上传运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">

4
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
Unescape View File

@ -169,6 +169,10 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="erpMark" label="上传运管状态" align="center" width="100">
</el-table-column>
<el-table-column prop="erpMassage" label="上传运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">

4
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
Unescape View File

@ -127,6 +127,10 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="erpMark" label="上传运管状态" align="center" width="100">
</el-table-column>
<el-table-column prop="erpMassage" label="上传运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">

4
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
Unescape View File

@ -133,6 +133,10 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="erpMark" label="上传运管状态" align="center" width="100">
</el-table-column>
<el-table-column prop="erpMassage" label="上传运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">

4
jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
Unescape View File

@ -130,6 +130,10 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="erpMark" label="上传运管状态" align="center" width="100">
</el-table-column>
<el-table-column prop="erpMassage" label="上传运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">

Write Preview
Loading…
Cancel
Save