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

Compare commits

base: yonyou:59c0dc4fc8ea2b6c829acd97588155fc68bea422
Branches Tags
yonyou:main
yonyou:dev
..
compare: yonyou:2d06bd8fb2c60b4d58ce011349ff2e4d1379b33a
Branches Tags
yonyou:main
yonyou:dev

No commits in common. "59c0dc4fc8ea2b6c829acd97588155fc68bea422" and "2d06bd8fb2c60b4d58ce011349ff2e4d1379b33a" have entirely different histories.
59c0dc4fc8 ... 2d06bd8fb2

3 changed files with 7 additions and 25 deletions
Show Stats Expand all files Collapse all files

8
mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
View File

@ -109,17 +109,11 @@ public class PickmToBuyingreqAction implements ICommonAction {
PickmItemVO[] items = (PickmItemVO[]) vo.getChildren(PickmItemVO.class); PickmItemVO[] items = (PickmItemVO[]) vo.getChildren(PickmItemVO.class);
if (items != null) { if (items != null) {
for (PickmItemVO child : items) { for (PickmItemVO child : items) {
//只合并项目专用料数据
if(child.getBprojectmaterial().booleanValue()){
mergedChildren.add(child);
}
// CircularlyAccessibleValueObject 实现了 ISuperVO // CircularlyAccessibleValueObject 实现了 ISuperVO
mergedChildren.add(child);
} }
} }
} }
if(mergedChildren.size() == 0){
continue;
}
AggPickmVO newVO = new AggPickmVO(); AggPickmVO newVO = new AggPickmVO();
newVO.setParent(group.get(0).getParentVO()); newVO.setParent(group.get(0).getParentVO());

8
mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
View File

@ -115,17 +115,11 @@ public class PickmToPmo implements ICommonAction {
PickmItemVO[] items = (PickmItemVO[]) vo.getChildren(PickmItemVO.class); PickmItemVO[] items = (PickmItemVO[]) vo.getChildren(PickmItemVO.class);
if (items != null) { if (items != null) {
for (PickmItemVO child : items) { for (PickmItemVO child : items) {
//只合并项目专用料数据
if(child.getBprojectmaterial().booleanValue()){
mergedChildren.add(child);
}
// CircularlyAccessibleValueObject 实现了 ISuperVO // CircularlyAccessibleValueObject 实现了 ISuperVO
mergedChildren.add(child);
} }
} }
} }
if(mergedChildren.size() == 0){
continue;
}
AggPickmVO newVO = new AggPickmVO(); AggPickmVO newVO = new AggPickmVO();
newVO.setParent(group.get(0).getParentVO()); newVO.setParent(group.get(0).getParentVO());

16
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java
View File

@ -11,8 +11,6 @@ import nc.bs.uapbd.util.MyHelper;
import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
import nc.jdbc.framework.processor.MapListProcessor; import nc.jdbc.framework.processor.MapListProcessor;
import nc.jdbc.framework.processor.MapProcessor; import nc.jdbc.framework.processor.MapProcessor;
import nc.pub.billcode.impl.BillCodeManageImpl;
import nc.pub.billcode.itf.IBillcodeManage;
import nc.vo.bc.pmpub.project.ProjectHeadVO; import nc.vo.bc.pmpub.project.ProjectHeadVO;
import nc.vo.bd.bom.bom0202.entity.BomVO; import nc.vo.bd.bom.bom0202.entity.BomVO;
import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.MaterialVO;
@ -78,22 +76,19 @@ public class SyncEpicMesUtil {
} }
if ("N".equals(auditCode)) { if ("N".equals(auditCode)) {
JSONObject data = buildSyncData(aggVO); JSONObject data = buildSyncData(aggVO);
// pushData(pmoUrl, data); pushData(pmoUrl, data);
} else { } else {
JSONObject data = buildSyncData(aggVO); JSONObject data = buildSyncData(aggVO);
// pushData(pmoUrl, data); pushData(pmoUrl, data);
JSONObject buildSyncData = buildSyncCodeData(aggVO); JSONObject buildSyncData = buildSyncCodeData(aggVO);
jsonArray.add(buildSyncData); jsonArray.add(buildSyncData);
} }
} }
if (!jsonArray.isEmpty()) { if (!jsonArray.isEmpty()) {
// pushData(codeUrl, jsonArray); pushData(codeUrl, jsonArray);
} }
logDl.info("生产订单同步到艾普MES系统处理完成。"); logDl.info("生产订单同步到艾普MES系统处理完成。");
} }
@ -320,9 +315,8 @@ public class SyncEpicMesUtil {
for (PMOItemVO item : vo.getChildrenVO()) { for (PMOItemVO item : vo.getChildrenVO()) {
HYPubBO hybo = new HYPubBO(); HYPubBO hybo = new HYPubBO();
Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' "); Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' ");
IBillcodeManage billcodeManage=new BillCodeManageImpl();
String code= billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule",hvo.getPk_group(),hvo.getPk_org()); String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + "0001";
String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code;
jsonArray.add(detailItem); jsonArray.add(detailItem);
} }
obj.put("releaseNo", jsonArray); obj.put("releaseNo", jsonArray);