Merge branch 'main' of http://172.168.16.71:7070/taikai/taikai2312.git into main
This commit is contained in:
commit
439f43cd12
|
@ -134,7 +134,10 @@ public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoServic
|
|||
|
||||
|
||||
private AggregatedValueObject[] addFromSource(AggregatedValueObject[] retvos) {
|
||||
this.processRowNO(this.processAfterVoChange((AggregatedValueObject[]) retvos));
|
||||
if (retvos.length == 0) {
|
||||
return retvos;
|
||||
}
|
||||
this.processRowNO(this.processAfterVoChange(retvos));
|
||||
if (retvos instanceof SaleOutVO[]) {
|
||||
Bill4CFor45Process proc = new Bill4CFor45Process(false);
|
||||
proc.setBPushSave(false);
|
||||
|
@ -146,11 +149,11 @@ public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoServic
|
|||
proc.setWhQuery(new WarehouseInfoQuery());
|
||||
proc.setBilltypeQuery(new BillTypeInfoQuery());
|
||||
proc.setContext(this.context);
|
||||
retvos = proc.changeToSaleOutVO((SaleOutVO[]) ((SaleOutVO[]) retvos));
|
||||
this.checkCbiz((SaleOutVO[]) ((SaleOutVO[]) retvos));
|
||||
retvos = proc.changeToSaleOutVO((SaleOutVO[]) retvos);
|
||||
this.checkCbiz((SaleOutVO[]) retvos);
|
||||
}
|
||||
|
||||
return (AggregatedValueObject[]) retvos;
|
||||
return retvos;
|
||||
}
|
||||
|
||||
protected AggregatedValueObject[] processAfterVoChange(AggregatedValueObject[] retvos) {
|
||||
|
@ -164,18 +167,15 @@ public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoServic
|
|||
process.setWhQuery(new WarehouseInfoQuery());
|
||||
process.setBilltypeQuery(new BillTypeInfoQuery());
|
||||
process.setContext(this.context);
|
||||
return process.processBillVOs((ICBillVO[]) ((ICBillVO[]) retvos));
|
||||
return process.processBillVOs((ICBillVO[]) retvos);
|
||||
}
|
||||
|
||||
protected void setClientDbilldate(AggregatedValueObject[] retvos) {
|
||||
long time = InvocationInfoProxy.getInstance().getBizDateTime();
|
||||
UFDate date = new UFDate(time);
|
||||
AggregatedValueObject[] var5 = retvos;
|
||||
int var6 = retvos.length;
|
||||
|
||||
for (int var7 = 0; var7 < var6; ++var7) {
|
||||
AggregatedValueObject retvo = var5[var7];
|
||||
ICBillVO billvo = (ICBillVO) retvo;
|
||||
for(AggregatedValueObject retvo : retvos) {
|
||||
ICBillVO billvo = (ICBillVO)retvo;
|
||||
billvo.getHead().setDbilldate(date);
|
||||
}
|
||||
|
||||
|
@ -187,20 +187,13 @@ public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoServic
|
|||
} else {
|
||||
long time = InvocationInfoProxy.getInstance().getBizDateTime();
|
||||
UFDate date = new UFDate(time);
|
||||
AggregatedValueObject[] var5 = retvos;
|
||||
int var6 = retvos.length;
|
||||
|
||||
for (int var7 = 0; var7 < var6; ++var7) {
|
||||
AggregatedValueObject bill = var5[var7];
|
||||
for(AggregatedValueObject bill : retvos) {
|
||||
CircularlyAccessibleValueObject[] bodys = bill.getChildrenVO();
|
||||
if (!ValueCheckUtil.isNullORZeroLength(bodys)) {
|
||||
CircularlyAccessibleValueObject[] var10 = bodys;
|
||||
int var11 = bodys.length;
|
||||
|
||||
for (int var12 = 0; var12 < var11; ++var12) {
|
||||
CircularlyAccessibleValueObject body = var10[var12];
|
||||
body.setAttributeValue("crowno", (Object) null);
|
||||
if (body.getAttributeValue("nnum") != null) {
|
||||
for(CircularlyAccessibleValueObject body : bodys) {
|
||||
body.setAttributeValue("crowno", (Object)null);
|
||||
if (body.getAttributeValue("nnum") != null && body.getAttributeValue("dbizdate") == null) {
|
||||
body.setAttributeValue("dbizdate", date);
|
||||
}
|
||||
}
|
||||
|
@ -218,18 +211,11 @@ public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoServic
|
|||
if (!ValueCheckUtil.isNullORZeroLength(cbiztypes)) {
|
||||
String pk_group = InvocationInfoProxy.getInstance().getGroupId();
|
||||
String arriveCode = SOBillType.Delivery.getCode();
|
||||
String[] var5 = cbiztypes;
|
||||
int var6 = cbiztypes.length;
|
||||
|
||||
for (int var7 = 0; var7 < var6; ++var7) {
|
||||
String biztype = var5[var7];
|
||||
for(String biztype : cbiztypes) {
|
||||
BillbusinessVO[] businessVOs = PfServiceScmUtil.findBillbusinessVOs(biztype, pk_group);
|
||||
if (!ValueCheckUtil.isNullORZeroLength(businessVOs)) {
|
||||
BillbusinessVO[] var10 = businessVOs;
|
||||
int var11 = businessVOs.length;
|
||||
|
||||
for (int var12 = 0; var12 < var11; ++var12) {
|
||||
BillbusinessVO vo = var10[var12];
|
||||
for(BillbusinessVO vo : businessVOs) {
|
||||
if (StringUtil.isStringEqual(vo.getPk_billtype(), arriveCode)) {
|
||||
ExceptionUtils.wrappBusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4008003_0", "04008003-0251"));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue