yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-05-15 09:32:20 +08:00
parent cc00d496fc 1742100242
commit 1c26c4e2ab
3 changed files with 217 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
mmpps/src/public/nc/rule/mmpps/plo/PloProdDeptRule.java
View File

@ -32,129 +32,123 @@ import nc.vo.mmpac.pickm.entity.PickmItemVO;
public class PloProdDeptRule implements IRule<AggregatedPoVO> { public class PloProdDeptRule implements IRule<AggregatedPoVO> {
@Override @Override
public void process(AggregatedPoVO[] vos) { public void process(AggregatedPoVO[] vos) {
if (null == vos) { if (null == vos) {
return; return;
} }
Map<String, List<String>> map = new HashMap<String, List<String>>(); Map<String, List<String>> map = new HashMap<String, List<String>>();
ArrayList<String> vsrcbidList = new ArrayList<>(); ArrayList<String> vsrcbidList = new ArrayList<>();
for (AggregatedPoVO agg : vos) { for (AggregatedPoVO agg : vos) {
PoVO plo = agg.getParentVO(); PoVO plo = agg.getParentVO();
String vid = plo.getCmaterialvid(); String vid = plo.getCmaterialvid();
String stockorgid = plo.getCstockorgid(); String stockorgid = plo.getCstockorgid();
String stockorgvid = plo.getCstockorgvid(); String stockorgvid = plo.getCstockorgvid();
String prodDeptid = plo.getCproddeptid(); String prodDeptid = plo.getCproddeptid();
String prodDeptvid = plo.getCproddeptvid(); String prodDeptvid = plo.getCproddeptvid();
Integer posource = plo.getFposource(); Integer posource = plo.getFposource();
if (PoSourceEnum.COMPUT == posource && MMValueCheck.isEmpty(prodDeptid) if (PoSourceEnum.COMPUT == posource && MMValueCheck.isEmpty(prodDeptid) && MMValueCheck.isEmpty(prodDeptvid)
&& MMValueCheck.isEmpty(prodDeptvid) && MMValueCheck.isNotEmpty(stockorgid) && MMValueCheck.isNotEmpty(stockorgid) && MMValueCheck.isNotEmpty(stockorgvid)) {
&& MMValueCheck.isNotEmpty(stockorgvid)) { List<String> vids = map.get(stockorgid);
List<String> vids = map.get(stockorgid); if (null == vids) {
if (null == vids) { List<String> list = new ArrayList<String>();
List<String> list = new ArrayList<String>(); list.add(vid);
list.add(vid); map.put(stockorgid, list);
map.put(stockorgid, list); } else {
} vids.add(vid);
else { }
vids.add(vid); }
} String vsrcbid = plo.getVsrcbid();// 来源单据表体主键
} // 需求来源为备料计划的才回写
String vsrcbid = plo.getVsrcbid();//来源单据表体主键 if (PoSourceEnum.COMPUT == posource && plo.getFdemandbill() != null && plo.getFdemandbill() == 1) {
int fdemandbill = plo.getFdemandbill();//需求来源 vsrcbidList.add(vsrcbid);
if (PoSourceEnum.COMPUT == posource && fdemandbill == 1) { }
vsrcbidList.add(vsrcbid); }
} if (vsrcbidList != null && vsrcbidList.size() > 0) {
} String[] vsrcbids = vsrcbidList.toArray(new String[vsrcbidList.size()]);
if (vsrcbidList != null && vsrcbidList.size() > 0) { Map<String, AggPickmVO> pickmVOMap;
String[] vsrcbids = vsrcbidList.toArray(new String[vsrcbidList.size()]); try {
Map<String, AggPickmVO> pickmVOMap; pickmVOMap = NCLocator.getInstance().lookup(IPickmPubQueryService.class).queryPickm4Issue(vsrcbids);
try { } catch (BusinessException e) {
pickmVOMap = NCLocator.getInstance().lookup(IPickmPubQueryService.class) throw new RuntimeException(e);
.queryPickm4Issue(vsrcbids); }
} catch (BusinessException e) { pickmVOMap.getClass();
throw new RuntimeException(e); for (AggregatedPoVO agg : vos) {
} PoVO plo = agg.getParentVO();
pickmVOMap.getClass(); String vsrcbid = plo.getVsrcbid();// 来源单据表体主键
for (AggregatedPoVO agg : vos) { AggPickmVO aggPickmVOData = pickmVOMap.get(vsrcbid);
PoVO plo = agg.getParentVO(); if (aggPickmVOData != null) {
String vsrcbid = plo.getVsrcbid();//来源单据表体主键 PickmItemVO[] children = (PickmItemVO[]) aggPickmVOData.getChildren(PickmItemVO.class);
AggPickmVO aggPickmVOData = pickmVOMap.get(vsrcbid); String vbdef5 = "";// 合同编号
if (aggPickmVOData != null) { String vbdef6 = "";// 合同销售订单号
PickmItemVO[] children = (PickmItemVO[]) aggPickmVOData.getChildren(PickmItemVO.class); String vbdef7 = "";// 标前项目号
String vbdef5 = "";//合同编号 for (PickmItemVO pickmItemVO : children) {
String vbdef6 = "";//合同销售订单号 if (pickmItemVO.getCpickm_bid().equals(vsrcbid)) {
String vbdef7 = "";//标前项目号 vbdef5 = pickmItemVO.getVbdef5();// 合同编号
for (PickmItemVO pickmItemVO : children) { vbdef6 = pickmItemVO.getVbdef6();// 合同销售订单号
if (pickmItemVO.getCpickm_bid().equals(vsrcbid)) { vbdef7 = pickmItemVO.getVbdef7();// 标前项目号
vbdef5 = pickmItemVO.getVbdef5();//合同编号 }
vbdef6 = pickmItemVO.getVbdef6();//合同销售订单号 }
vbdef7 = pickmItemVO.getVbdef7();//标前项目号 plo.setVdef2(vbdef5);// 合同编号
} plo.setVdef3(vbdef6);// 合同销售订单号
} plo.setVdef4(vbdef7);// 标前项目号
plo.setVdef2(vbdef5);//合同编号 }
plo.setVdef3(vbdef6);//合同销售订单号 }
plo.setVdef4(vbdef7);//标前项目号 }
} Set<String> stockorgids = map.keySet();
} Iterator<String> i = stockorgids.iterator();
} while (i.hasNext()) {
Set<String> stockorgids = map.keySet(); String key = i.next();
Iterator<String> i = stockorgids.iterator(); List<String> vids = map.get(key);
while (i.hasNext()) { Map<String, MaterialProdVO> results = MaterialPubService.queryMaterialProduceInfoByPks(
String key = i.next(); vids.toArray(new String[0]), key, new String[] { MaterialProdVO.PK_PRODEPTDOC });
List<String> vids = map.get(key); for (AggregatedPoVO agg : vos) {
Map<String, MaterialProdVO> results = PoVO plo = agg.getParentVO();
MaterialPubService.queryMaterialProduceInfoByPks(vids.toArray(new String[0]), key, new String[] { String vid = plo.getCmaterialvid();
MaterialProdVO.PK_PRODEPTDOC String stockorgid = plo.getCstockorgid();
}); String stockorgvid = plo.getCstockorgvid();
for (AggregatedPoVO agg : vos) { Integer posource = plo.getFposource();
PoVO plo = agg.getParentVO(); if (PoSourceEnum.COMPUT == posource && MMValueCheck.isNotEmpty(stockorgid)
String vid = plo.getCmaterialvid(); && MMValueCheck.isNotEmpty(stockorgvid)) {
String stockorgid = plo.getCstockorgid(); if (null != results) {
String stockorgvid = plo.getCstockorgvid(); MaterialProdVO prodvo = results.get(vid);
Integer posource = plo.getFposource(); if (null != prodvo) {
if (PoSourceEnum.COMPUT == posource && MMValueCheck.isNotEmpty(stockorgid) plo.setCproddeptid(prodvo.getPk_prodeptdoc());// 生产部门ID
&& MMValueCheck.isNotEmpty(stockorgvid)) { }
if (null != results) { }
MaterialProdVO prodvo = results.get(vid); }
if (null != prodvo) { }
plo.setCproddeptid(prodvo.getPk_prodeptdoc());// 生产部门ID }
} // 根据生产部门ID查询设置VID
} List<String> proddeptids = new ArrayList<String>();
} for (AggregatedPoVO agg : vos) {
} PoVO plo = agg.getParentVO();
} String prodDeptid = plo.getCproddeptid();
// 根据生产部门ID查询设置VID Integer posource = plo.getFposource();
List<String> proddeptids = new ArrayList<String>(); if (PoSourceEnum.COMPUT == posource && MMValueCheck.isNotEmpty(prodDeptid)) {
for (AggregatedPoVO agg : vos) { proddeptids.add(prodDeptid);
PoVO plo = agg.getParentVO(); }
String prodDeptid = plo.getCproddeptid(); }
Integer posource = plo.getFposource(); IDeptPubService deptPubService = this.getDeptPubService();
if (PoSourceEnum.COMPUT == posource && MMValueCheck.isNotEmpty(prodDeptid)) { try {
proddeptids.add(prodDeptid); HashMap<String, String> results = deptPubService.getLastVIDSByDeptIDS(proddeptids.toArray(new String[0]));
} if (null != results) {
} for (AggregatedPoVO agg : vos) {
IDeptPubService deptPubService = this.getDeptPubService(); PoVO plo = agg.getParentVO();
try { String prodDeptid = plo.getCproddeptid();
HashMap<String, String> results = deptPubService.getLastVIDSByDeptIDS(proddeptids.toArray(new String[0])); Integer posource = plo.getFposource();
if (null != results) { if (PoSourceEnum.COMPUT == posource && MMValueCheck.isNotEmpty(prodDeptid)) {
for (AggregatedPoVO agg : vos) { plo.setCproddeptvid(results.get(prodDeptid));
PoVO plo = agg.getParentVO(); }
String prodDeptid = plo.getCproddeptid(); }
Integer posource = plo.getFposource(); }
if (PoSourceEnum.COMPUT == posource && MMValueCheck.isNotEmpty(prodDeptid)) { } catch (BusinessException e) {
plo.setCproddeptvid(results.get(prodDeptid)); ExceptionUtils.wrappException(e);
} }
}
}
}
catch (BusinessException e) {
ExceptionUtils.wrappException(e);
}
} }
private IDeptPubService getDeptPubService() { private IDeptPubService getDeptPubService() {
return NCLocator.getInstance().lookup(IDeptPubService.class); return NCLocator.getInstance().lookup(IDeptPubService.class);
} }
} }

89
sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTypeToTspzUtil.java Normal file
View File

@ -0,0 +1,89 @@
package nc.bs.sscivm.ivsale.util;
import nc.vo.sscivm.ivmpub.InvoiceTypeEnum;
import java.util.HashMap;
import java.util.Map;
/**
* 发票类型和特殊票种映射工具类
* @author wangyl7
*
*/
public class InvoiceTypeToTspzUtil {
private final static Map<Integer,String> invoiceMap = new HashMap<Integer,String>();
private final static Map<Integer,String> tspzMap = new HashMap<Integer,String>();
static {
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toIntValue(), "4");
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.toIntValue(), "1");
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.toIntValue(), "2");
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toIntValue(), "3");
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toIntValue(), "4");
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_ESCTYFP.toIntValue(), "15");//二手车统一销售与机打重复
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.toIntValue(), "1");
invoiceMap.put(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toIntValue(), "3");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toIntValue(), "12");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.toIntValue(), "16");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.toIntValue(), "16");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toIntValue(), "16");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toIntValue(), "16");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.toIntValue(), "9");
tspzMap.put(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toIntValue(), "9");
}
/**
* 获取真实的发票类型
* @param fplx 发票类型
* @return 真实的发票类型
*/
public static String getRealInvoicetype(Integer fplx){
if (invoiceMap.containsKey(fplx)){
return invoiceMap.get(fplx);
}
return String.valueOf(fplx);
}
/**
* 获取特殊票种
* @param fplx 发票类型
* @return 特殊票种
*/
public static String getTspz(Integer fplx){
if (tspzMap.containsKey(fplx)){
return tspzMap.get(fplx);
}
return null;
}
/**
* 更具发票类型和特殊票种转发票类型
* @param fplx
* @param tspz
* @return
*/
public static String getInvoicetypeByFplxAndTspz(String fplx, String tspz){
//非特殊票种
if (tspz == null || tspz.startsWith("E")){
return fplx;
}
//全电发票不拼接
if ("31".equals(fplx) || "32".equals(fplx) ||"33".equals(fplx) || "34".equals(fplx)){
return fplx;
}
//增值税专用发票(机动车)
if ("412".equals(fplx + tspz)){
return InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toStringValue();
}
//农产品收购
if ("9".equals(tspz)) {
return fplx + "0" + tspz;
}
//数电纸质发票(机动车销售统一发票
if ("36".equals(fplx)){
return fplx;
}
//其他特殊票种发票
return fplx + tspz;
}
}

16
uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java
View File

@ -88,6 +88,8 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
private static Map<String, Object> tsMap = new HashMap(); private static Map<String, Object> tsMap = new HashMap();
private String orgCodeFlag =null;
private static Map<String, Object> voMap = new HashMap(); private static Map<String, Object> voMap = new HashMap();
private static Map<String, Set<String>> idsMap = new HashMap(); private static Map<String, Set<String>> idsMap = new HashMap();
@ -112,7 +114,11 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
list.add(agg); list.add(agg);
} }
AggBomVO[] aggVOs = (AggBomVO[]) list.toArray(new AggBomVO[list.size()]); AggBomVO[] aggVOs = (AggBomVO[]) list.toArray(new AggBomVO[list.size()]);
if(aggVOs[0].getParentVO().getAttributeValue("pk_org")==null||aggVOs[0].getParentVO().getAttributeValue("pk_org")==""){
ExceptionUtils.wrappBusinessException("请求参数pk_org为空，请检查！！！！");
}else{
this.orgCodeFlag=aggVOs[0].getParentVO().getAttributeValue("pk_org").toString();
}
BillFieldsCodeToPkUtil.doTranslateVOFields(aggVOs); BillFieldsCodeToPkUtil.doTranslateVOFields(aggVOs);
IUifService iUifService = NCLocator.getInstance().lookup(IUifService.class); IUifService iUifService = NCLocator.getInstance().lookup(IUifService.class);
for (AggBomVO aggtwo : aggVOs) { for (AggBomVO aggtwo : aggVOs) {
@ -170,7 +176,7 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
result = service.insertBom((AggBomVO[]) addAggvoList.toArray(new AggBomVO[0])); result = service.insertBom((AggBomVO[]) addAggvoList.toArray(new AggBomVO[0]));
} else if (!commitAggvoList.isEmpty() && addAggvoList.isEmpty()) { } else if (!commitAggvoList.isEmpty() && addAggvoList.isEmpty()) {
List<AggBomVO> newAggVOList = new ArrayList<>(); List<AggBomVO> newAggVOList = new ArrayList<>();
if ("gaoning".equals(userCode)) { if ("gaoning".equals(userCode)|| "C029".equals(orgCodeFlag)) {
for (AggBomVO aggvo : commitAggvoList) { for (AggBomVO aggvo : commitAggvoList) {
result = service.insertCommitBomWithParam(new AggBomVO[] { aggvo }, true, true); result = service.insertCommitBomWithParam(new AggBomVO[] { aggvo }, true, true);
newAggVOList.add(result[0]); newAggVOList.add(result[0]);
@ -720,7 +726,7 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
if (VersionTypeEnum.AVAILABLE.equalsValue(head.getHfversiontype()) if (VersionTypeEnum.AVAILABLE.equalsValue(head.getHfversiontype())
&& !head.getCbomid().equals(headvo.getCbomid())) { && !head.getCbomid().equals(headvo.getCbomid())) {
// sdlizheng --添加独立判断--plm三方越过此校验 // sdlizheng --添加独立判断--plm三方越过此校验
if ("gaoning".equals(userCode) || "dlkgsrm".equals(userCode)) { if ("gaoning".equals(userCode) || "dlkgsrm".equals(userCode)|| "C029".equals(this.orgCodeFlag)) {
// AggBomVO afterVO = service.canceldefault(aggBomVO); // AggBomVO afterVO = service.canceldefault(aggBomVO);
} else { } else {
return UFBoolean.TRUE; return UFBoolean.TRUE;
@ -774,14 +780,14 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
agg.getParent().setAttributeValue("fbillstatus", Integer.valueOf(-1)); agg.getParent().setAttributeValue("fbillstatus", Integer.valueOf(-1));
agg.getParent().setAttributeValue("hfbomsource", Integer.valueOf(1)); agg.getParent().setAttributeValue("hfbomsource", Integer.valueOf(1));
agg.getParent().setAttributeValue("hfbomcategory", Integer.valueOf(1)); agg.getParent().setAttributeValue("hfbomcategory", Integer.valueOf(1));
if ("gaoning".equals(userCode) || "dlkgsrm".equals(userCode)) { if ("gaoning".equals(userCode) || "dlkgsrm".equals(userCode)|| "C029".equals(this.orgCodeFlag)) {
// sdlizheng // sdlizheng
// 1、对于之前不存在的BOM，新增时：如果是传自由态，不默认且无效，走标准逻辑，如果传的是审批态默认且有效。2025年4月11日16点28分 start // 1、对于之前不存在的BOM，新增时：如果是传自由态，不默认且无效，走标准逻辑，如果传的是审批态默认且有效。2025年4月11日16点28分 start
if (fbillstatus != null && "1".equals(fbillstatus.toString())) { if (fbillstatus != null && "1".equals(fbillstatus.toString())) {
agg.getParent().setAttributeValue("hfversiontype", Integer.valueOf(1)); agg.getParent().setAttributeValue("hfversiontype", Integer.valueOf(1));
agg.getParent().setAttributeValue("hbdefault", UFBoolean.TRUE); agg.getParent().setAttributeValue("hbdefault", UFBoolean.TRUE);
}else if(fbillstatus != null && "-1".equals(fbillstatus.toString())){ }else if(fbillstatus != null && "-1".equals(fbillstatus.toString())){
if("gaoning".equals(userCode)){ if("gaoning".equals(userCode)|| "C029".equals(this.orgCodeFlag)){
agg.getParent().setAttributeValue("hfversiontype", Integer.valueOf(1)); agg.getParent().setAttributeValue("hfversiontype", Integer.valueOf(1));
agg.getParent().setAttributeValue("hbdefault", UFBoolean.TRUE); agg.getParent().setAttributeValue("hbdefault", UFBoolean.TRUE);
} }