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 7287e3dc14
commit 0ae631b2e4
19 changed files with 261 additions and 220 deletions
Show Stats Download Patch File Download Diff File

1
jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml
Unescape View File

@ -113,6 +113,7 @@ springdoc:
# password: 123456 # password: 123456
config: config:
yunguaninterfaceurl: http://172.16.1.50:8020
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用) ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用) FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)

1
jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml
Unescape View File

@ -113,6 +113,7 @@ springdoc:
# password: 123456 # password: 123456
config: config:
yunguaninterfaceurl: http://172.16.8.54:8020
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:40000 #后端域名(文档预览中使用) ApiDomain: http://127.0.0.1:40000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:9000 #前端域名(文档预览中使用) FrontDomain: http://127.0.0.1:9000 #前端域名(文档预览中使用)

1
jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml
Unescape View File

@ -116,6 +116,7 @@ springdoc:
# password: 123456 # password: 123456
config: config:
yunguaninterfaceurl: http://172.16.1.50:8020
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用) ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用) FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)

11
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
Unescape View File

@ -32,6 +32,7 @@ import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import jnpf.util.wxutil.HttpUtil; import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.database.model.superQuery.SuperJsonModel;
@ -111,6 +112,8 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
private BusinessOrderProductRelationalService businessOrderProductRelationalService; private BusinessOrderProductRelationalService businessOrderProductRelationalService;
@Autowired @Autowired
private BusinessLineService businessLineService; private BusinessLineService businessLineService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
@Override @Override
public List<CwsettlementEntity> getList(CwsettlementPagination cwsettlementPagination){ public List<CwsettlementEntity> getList(CwsettlementPagination cwsettlementPagination){
@ -1319,7 +1322,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setERR_MESSAGE(""); yunguanSaleSettlementProductModel.setERR_MESSAGE("");
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel); yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
} }
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList)); JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/actLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString()); cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
@ -1406,7 +1409,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setESB_DTM(null); yunguanSaleSettlementModel.setESB_DTM(null);
yunguanSaleSettlementModel.setESB_MESSAGE(""); yunguanSaleSettlementModel.setESB_MESSAGE("");
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size()); yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel)); JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString()); cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
@ -1505,7 +1508,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setCK_ORDER(cwsettlementsummaryModel.getDocmentNo()); yunguanSaleSettlementProductModel.setCK_ORDER(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel); yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
} }
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList)); JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString()); cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
@ -1593,7 +1596,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setCONSDR_USER(cwsettlementEntity.getLastModifyUserId()); yunguanSaleSettlementModel.setCONSDR_USER(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementModel.setCONSDR_DATE(cwsettlementEntity.getLastModifyTime()); yunguanSaleSettlementModel.setCONSDR_DATE(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size()); yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel)); JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString()); cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());

31
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
Unescape View File

@ -30,6 +30,7 @@ import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import jnpf.util.wxutil.HttpUtil; import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.database.model.superQuery.SuperJsonModel;
@ -97,6 +98,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
private ReceiptOrderService receiptOrderService; private ReceiptOrderService receiptOrderService;
@Autowired @Autowired
private BusinessLineService businessLineService; private BusinessLineService businessLineService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
@Override @Override
public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){ public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){
return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType()); return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType());
@ -1011,20 +1014,20 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
warehousingOutboundPoundlistService.saveOrUpdate(entitys); warehousingOutboundPoundlistService.saveOrUpdate(entitys);
} }
} }
// if (entity.getWarehousingOutboundType().equals("12")){ if (entity.getWarehousingOutboundType().equals("12")){
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId()); List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) { if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList)); JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
// if (ObjectUtil.isNotEmpty(saleCode)){ if (ObjectUtil.isNotEmpty(saleCode)){
// entity.setErpMark(saleCode.get("code").toString()); entity.setErpMark(saleCode.get("code").toString());
// entity.setErpMassage(saleCode.get("errmsg").toString()); entity.setErpMassage(saleCode.get("errmsg").toString());
// }else { }else {
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
// this.saveOrUpdate(entity); this.saveOrUpdate(entity);
// } }
// } }
} }
@Override @Override

31
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
Unescape View File

@ -31,6 +31,7 @@ import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.database.model.superQuery.SuperJsonModel;
@ -99,6 +100,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
private ReceiptRelationService receiptRelationService; private ReceiptRelationService receiptRelationService;
@Resource @Resource
private BusinessLineMapper businessLineMapper; private BusinessLineMapper businessLineMapper;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
@Override @Override
public List<WarehousingStorageEntity> getList(WarehousingStoragePagination warehousingStoragePagination){ public List<WarehousingStorageEntity> getList(WarehousingStoragePagination warehousingStoragePagination){
return getTypeList(warehousingStoragePagination,warehousingStoragePagination.getDataType()); return getTypeList(warehousingStoragePagination,warehousingStoragePagination.getDataType());
@ -1035,20 +1038,20 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
warehousingStoragePoundlistService.saveOrUpdate(entitys); warehousingStoragePoundlistService.saveOrUpdate(entitys);
} }
} }
// if (entity.getWarehousingStorageType().equals("15")){ if (entity.getWarehousingStorageType().equals("15")){
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId()); List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) { if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList)); JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
// if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
// entity.setErpMark(purchaseCode.get("code").toString()); entity.setErpMark(purchaseCode.get("code").toString());
// entity.setErpMassage(purchaseCode.get("errmsg").toString()); entity.setErpMassage(purchaseCode.get("errmsg").toString());
// }else{ }else{
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
// this.saveOrUpdate(entity); this.saveOrUpdate(entity);
// } }
// } }
} }

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

@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A; import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -130,7 +131,8 @@ public class BusinessOrderController {
private CwsettlementController cwsettlementController; private CwsettlementController cwsettlementController;
@Autowired @Autowired
private CwsettlementService cwsettlementService; private CwsettlementService cwsettlementService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
/** /**
* 列表 * 列表
* *
@ -635,55 +637,55 @@ public class BusinessOrderController {
}else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){ }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){
entity.setStatus("4");//销售单直送审核通过后状态改为待出库 entity.setStatus("4");//销售单直送审核通过后状态改为待出库
} }
// if (entity.getBusinessType().equals("1")) { if (entity.getBusinessType().equals("1")) {
// YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id); YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
// if (ObjectUtil.isNotEmpty(purchaseOrder)) { if (ObjectUtil.isNotEmpty(purchaseOrder)) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder)); JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
// if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
// List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id); List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
// JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); JSONObject purchaseProductCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
// if(ObjectUtil.isNotEmpty(purchaseCode)){ if(ObjectUtil.isNotEmpty(purchaseCode)){
// entity.setErpMark(purchaseProductCode.get("code").toString()); entity.setErpMark(purchaseProductCode.get("code").toString());
// entity.setErpMassage(purchaseProductCode.get("errmsg").toString()); entity.setErpMassage(purchaseProductCode.get("errmsg").toString());
// }else{ }else{
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
// }else { }else {
// entity.setErpMark(purchaseCode.get("code").toString()); entity.setErpMark(purchaseCode.get("code").toString());
// entity.setErpMassage(purchaseCode.get("errmsg").toString()); entity.setErpMassage(purchaseCode.get("errmsg").toString());
// } }
// }else { }else {
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
// } }
// }else if (entity.getBusinessType().equals("2")){ }else if (entity.getBusinessType().equals("2")){
// YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id); YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
// if (ObjectUtil.isNotEmpty(saleOrder)){ if (ObjectUtil.isNotEmpty(saleOrder)){
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder)); JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
// if (ObjectUtil.isNotEmpty(saleCode)) { if (ObjectUtil.isNotEmpty(saleCode)) {
// if (saleCode.get("code").equals("200")) { if (saleCode.get("code").equals("200")) {
// List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id); List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
// JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); JSONObject saleProductCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
// if (ObjectUtil.isNotEmpty(saleProductCode)){ if (ObjectUtil.isNotEmpty(saleProductCode)){
// entity.setErpMark(saleCode.get("code").toString()); entity.setErpMark(saleCode.get("code").toString());
// entity.setErpMassage(saleCode.get("errmsg").toString()); entity.setErpMassage(saleCode.get("errmsg").toString());
// }else{ }else{
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
// }else{ }else{
// entity.setErpMark(saleCode.get("code").toString()); entity.setErpMark(saleCode.get("code").toString());
// entity.setErpMassage(saleCode.get("errmsg").toString()); entity.setErpMassage(saleCode.get("errmsg").toString());
// } }
// }else { }else {
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
// } }
// } }
businessOrderService.saveOrUpdate(entity); businessOrderService.saveOrUpdate(entity);
} }
} }

52
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
Unescape View File

@ -648,32 +648,32 @@ public class CwsettlementController {
} }
cwsettlementForm.setCreatorUserId(entity.getCreatorUserId()); cwsettlementForm.setCreatorUserId(entity.getCreatorUserId());
cwsettlementService.saveOrUpdate(cwsettlementForm,id,false); cwsettlementService.saveOrUpdate(cwsettlementForm,id,false);
// FlowTaskEntity flowTaskEntity = flowTaskService.getById(id); FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
// if (flowTaskEntity!=null){ if (flowTaskEntity!=null){
// QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>(); QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>();
// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId()); flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId());
// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId()); flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
// List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper); List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
// if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) { if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
// ActionResult entity1 = this.info(id); ActionResult entity1 = this.info(id);
// Map<String, Object> map = (Map<String, Object>) entity1.getData(); Map<String, Object> map = (Map<String, Object>) entity1.getData();
// CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions()); CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions());
// //推送结算单到运管 //推送结算单到运管
// if(ObjectUtil.equals(entity.getType(), "2")){ if(ObjectUtil.equals(entity.getType(), "2")){
// //销售 //销售
// boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity); boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
// if(headFlag){ if(headFlag){
// boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity); boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
// } }
// }else{ }else{
// //采购 //采购
// boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity); boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
// if(headFlag){ if(headFlag){
// boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity); boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
// } }
// } }
// } }
// } }
}catch(Exception e){ }catch(Exception e){
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }

28
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
Unescape View File

@ -38,8 +38,8 @@ import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A; import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import jnpf.annotation.JnpfField; import jnpf.annotation.JnpfField;
@ -74,6 +74,8 @@ import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils; import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.validation.Valid;
/** /**
* workOrder * workOrder
* @版本： V3.5 * @版本： V3.5
@ -140,6 +142,8 @@ public class WorkOrderController {
private WarehousingReturnService warehousingReturnService; private WarehousingReturnService warehousingReturnService;
@Autowired @Autowired
private WarehousingReportlossService warehousingReportlossService; private WarehousingReportlossService warehousingReportlossService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
/** /**
* 列表 * 列表
* *
@ -796,17 +800,17 @@ public class WorkOrderController {
warehousingOutboundController.createWork(id,warehousingOutboundForm); warehousingOutboundController.createWork(id,warehousingOutboundForm);
} }
} }
// List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id); List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
// List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id); List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
// yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1); yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
// JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList)); JSONObject workOrderCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
// if(ObjectUtil.isNotEmpty(workOrderCode)){ if(ObjectUtil.isNotEmpty(workOrderCode)){
// entity.setErpMark(workOrderCode.get("code").toString()); entity.setErpMark(workOrderCode.get("code").toString());
// entity.setErpMassage(workOrderCode.get("errmsg").toString()); entity.setErpMassage(workOrderCode.get("errmsg").toString());
// }else { }else {
// entity.setErpMark("N"); entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空"); entity.setErpMassage("ESB返回为空");
// } }
workOrderService.updateById(entity); workOrderService.updateById(entity);
} }
} }

42
jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
Unescape View File

@ -1896,33 +1896,33 @@ export default {
return sums; return sums;
}, },
initList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
this.dataForm.cwaccountstorageList.push(e)
}
//this.addcwaccountvoucherList();
},
// initList(list) { // initList(list) {
// let mark = false
// for (let i = 0; i < list.length; i++) { // for (let i = 0; i < list.length; i++) {
// const e = list[i]; // const e = list[i];
// if (e.yunguanMark == 'Y') { // this.dataForm.cwaccountstorageList.push(e)
// this.dataForm.cwaccountstorageList.push(e)
// } else {
// mark = true
// }
// }
// if (mark) {
// this.$message({
// message: '运管暂未返回正常订单状态',
// type: 'error',
// duration: 1000
// });
// return
// } // }
// //this.addcwaccountvoucherList(); // //this.addcwaccountvoucherList();
// }, // },
initList(list) {
let mark = false
for (let i = 0; i < list.length; i++) {
const e = list[i];
if (e.yunguanMark == 'Y') {
this.dataForm.cwaccountstorageList.push(e)
} else {
mark = true
}
}
if (mark) {
this.$message({
message: '存在运管暂未返回正常订单状态的订单',
type: 'error',
duration: 1000
});
return
}
//this.addcwaccountvoucherList();
},
typeChangeData() { typeChangeData() {
this.dataForm.cwaccountsubjectList = []; this.dataForm.cwaccountsubjectList = [];
this.dataForm.cwaccountcontractList = []; this.dataForm.cwaccountcontractList = [];

54
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
Unescape View File

@ -2054,6 +2054,51 @@ export default {
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: { dataRule: {
custTy: [{
required: true,
message: '请选择事务处理类型',
trigger: 'blur'
},],
invoiceDate: [{
required: true,
message: '请选择发票日期',
trigger: 'change'
},],
invoiceCnt: [{
required: true,
message: '请输入发票张数',
trigger: 'blur'
},],
invoiceType: [{
required: true,
message: '请选择发票类型',
trigger: 'change'
},],
attribute11: [{
required: true,
message: '请输入发票号码',
trigger: 'blur'
},],
invoiceAmount: [{
required: true,
message: '请输入发票金额',
trigger: 'blur'
},],
glDate: [{
required: true,
message: '请选择入账时间',
trigger: 'change'
},],
description: [{
required: true,
message: '请输入摘要',
trigger: 'blur'
},],
annexCnt: [{
required: true,
message: '请输入附件张数',
trigger: 'blur'
},],
type: [{ type: [{
required: true, required: true,
message: '请至少选择一个', message: '请至少选择一个',
@ -2991,6 +3036,15 @@ export default {
let isOk = true; let isOk = true;
for (let i = 0; i < this.dataForm.cwsettlementsummaryList.length; i++) { for (let i = 0; i < this.dataForm.cwsettlementsummaryList.length; i++) {
const e = this.dataForm.cwsettlementsummaryList[i]; const e = this.dataForm.cwsettlementsummaryList[i];
if (!e.itemNmInv) {
this.$message({
message: '开票商品名称不能为空',
type: 'error',
duration: 1000
});
isOk = false
break
}
} }
return isOk; return isOk;
}, },

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

@ -43,8 +43,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="申请状态"> <el-form-item label="申请状态">
<JnpfSelect v-model="query.applyState" placeholder="请选择" clearable :options="applyStateOptions" <JnpfSelect v-model="query.applyState" placeholder="请选择" clearable
:props="applyStateProps"> :options="applyStateOptions" :props="applyStateProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -150,12 +150,6 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="settlementAmount" label="应收/应付合计（含税）" align="center" width="150"> <!-- <el-table-column prop="settlementAmount" label="应收/应付合计（含税）" align="center" width="150">
</el-table-column> --> </el-table-column> -->
<!-- <el-table-column prop="paymentAmount" label="已付金额" align="center" width="150"> <!-- <el-table-column prop="paymentAmount" label="已付金额" align="center" width="150">
@ -196,7 +190,6 @@
<el-table-column prop="realNameA" label="修改用户" align="center"> <el-table-column prop="realNameA" label="修改用户" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="250" align="center"> <el-table-column label="操作" fixed="right" width="250" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1" <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@ -210,9 +203,9 @@
<el-button size="mini" type="text" <el-button size="mini" type="text"
v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2" v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2"
@click="shoufukuanHandle(scope.row)">收付款</el-button> @click="shoufukuanHandle(scope.row)">收付款</el-button>
<!-- <template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'"> <template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row)">重新推送</el-button> <el-button size="mini" type="text" @click="repush(scope.row)">重新推送</el-button>
</template> --> </template>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>

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

@ -266,9 +266,9 @@
@click="handleDelVoucher(scope.row.id)">删除 @click="handleDelVoucher(scope.row.id)">删除
</el-button> </el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'"> <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button> <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> --> </template>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -527,14 +527,14 @@ export default {
}) })
}, },
inBoundNotice(row) { inBoundNotice(row) {
// if (row.yunguanMark != 'Y') { if (row.yunguanMark != 'Y') {
// this.$message({ this.$message({
// type: 'error', type: 'error',
// message: '运管暂未返回正常订单状态', message: '运管暂未返回正常订单状态',
// duration: 1500, duration: 1500,
// }) })
// return return
// } }
const selectData = row const selectData = row
selectData.flag = '采购入库通知' selectData.flag = '采购入库通知'
if (!this.inBoundFlowList.length) { if (!this.inBoundFlowList.length) {

18
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
Unescape View File

@ -1789,15 +1789,15 @@ export default {
); );
}, },
getPurchaseOrder(val, val2) { getPurchaseOrder(val, val2) {
// if (val2.yunguanMark != 'Y') { if (val2.yunguanMark != 'Y') {
// this.dataForm.businessId = undefined this.dataForm.businessId = undefined
// this.$message({ this.$message({
// message: '运管暂未返回正常订单状态', message: '运管暂未返回正常订单状态',
// type: 'error', type: 'error',
// duration: 1000 duration: 1000
// }); });
// return return
// } }
this.dataForm.purchaseOrderInfo = []; this.dataForm.purchaseOrderInfo = [];
this.dataForm.purchaseOrderInfo[0] = val2; this.dataForm.purchaseOrderInfo[0] = val2;
this.dataForm.subjectId = val2.firstSubjectBasicId; this.dataForm.subjectId = val2.firstSubjectBasicId;

18
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
Unescape View File

@ -1732,15 +1732,15 @@ export default {
); );
}, },
getSaleOrder(val, val2) { getSaleOrder(val, val2) {
// if (val2.yunguanMark != 'Y') { if (val2.yunguanMark != 'Y') {
// this.dataForm.businessId = undefined this.dataForm.businessId = undefined
// this.$message({ this.$message({
// message: '运管暂未返回正常订单状态', message: '运管暂未返回正常订单状态',
// type: 'error', type: 'error',
// duration: 1000 duration: 1000
// }); });
// return return
// } }
this.dataForm.businessOrderInfoList = []; this.dataForm.businessOrderInfoList = [];
this.dataForm.businessOrderInfoList[0] = val2; this.dataForm.businessOrderInfoList[0] = val2;
this.dataForm.subjectId = val2.firstSubjectBasicId; this.dataForm.subjectId = val2.firstSubjectBasicId;

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

@ -229,9 +229,9 @@
@click="handleDelVoucher(scope.row.id)">删除 @click="handleDelVoucher(scope.row.id)">删除
</el-button> </el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'"> <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button> <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> --> </template>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -454,14 +454,14 @@ export default {
}) })
}, },
outBoundNotice(row) { outBoundNotice(row) {
// if (row.yunguanMark != 'Y') { if (row.yunguanMark != 'Y') {
// this.$message({ this.$message({
// type: 'error', type: 'error',
// message: '运管暂未返回正常订单状态', message: '运管暂未返回正常订单状态',
// duration: 1500, duration: 1500,
// }) })
// return return
// } }
const selectData = row const selectData = row
selectData.flag = '销售出库通知' selectData.flag = '销售出库通知'
if (!this.outBoundFlowList.length) { if (!this.outBoundFlowList.length) {

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

@ -151,9 +151,9 @@
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'"> <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button> <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> --> </template>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>

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

@ -157,9 +157,9 @@
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'"> <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button> <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> --> </template>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>

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

@ -167,9 +167,9 @@
</el-button> </el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState" <el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button> @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'"> <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button> <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> --> </template>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -590,14 +590,6 @@ export default {
}, },
addOstarts(row, status) { addOstarts(row, status) {
// if (row.erpMark != '200') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
let id = row.id let id = row.id
this.$confirm("此操作将进行加工, 是否继续?", "提示", { this.$confirm("此操作将进行加工, 是否继续?", "提示", {
type: "warning", type: "warning",
@ -652,14 +644,6 @@ export default {
}, },
addOstartsRescind(row, status) { addOstartsRescind(row, status) {
// if (row.erpMark != '200') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
let id = row.id let id = row.id
this.$confirm("此操作将进行取消加工, 是否继续?", "提示", { this.$confirm("此操作将进行取消加工, 是否继续?", "提示", {
type: "warning", type: "warning",
@ -703,14 +687,6 @@ export default {
}, },
addOrUpdateHandleOver(row, isDetail) { addOrUpdateHandleOver(row, isDetail) {
// if (row.erpMark != '200') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
let id = row ? row.id : "" let id = row ? row.id : ""
this.formVisibleOver = true this.formVisibleOver = true
this.$nextTick(() => { this.$nextTick(() => {

Write Preview
Loading…
Cancel
Save