diff --git a/ic/META-INF/ictk.upm b/ic/META-INF/ictk.upm new file mode 100644 index 0000000..bdce4e7 --- /dev/null +++ b/ic/META-INF/ictk.upm @@ -0,0 +1,10 @@ + + + + + + nccloud.pubitf.ic.outbound.service.IOutboundTransferVoService1 + nccloud.pubimpl.ic.outbound.service.OutboundTransferVoServiceImpl1 + + + \ No newline at end of file diff --git a/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/TransToSapplyBill1Action.java b/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/TransToSapplyBill1Action.java index 9d10122..1c3f664 100644 --- a/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/TransToSapplyBill1Action.java +++ b/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/TransToSapplyBill1Action.java @@ -14,7 +14,6 @@ import nccloud.framework.web.container.IRequest; import nccloud.framework.web.json.JsonFactory; import nccloud.framework.web.ui.pattern.billcard.BillCard; import nccloud.framework.web.ui.pattern.billcard.BillCardOperator; -import nccloud.pubitf.ic.outbound.service.IOutboundTransferVoService; import nccloud.pubitf.ic.outbound.service.IOutboundTransferVoService1; import nccloud.web.ic.pub.precision.ICBaseBillcardPrecisionHandler; @@ -33,7 +32,7 @@ public class TransToSapplyBill1Action implements ICommonAction { IJson json = JsonFactory.create(); TransferInfo transInfo = (TransferInfo) json.fromJson(read, TransferInfo.class); SapplyBillVO[] vos = null; - IOutboundTransferVoService1 service = (IOutboundTransferVoService1) ServiceLocator.find(IOutboundTransferVoService.class); + IOutboundTransferVoService1 service = (IOutboundTransferVoService1) ServiceLocator.find(IOutboundTransferVoService1.class); vos = service.transPickmTo4455(transInfo); BillCardOperator operator = new BillCardOperator(transInfo.getPagecode()); BillCard[] cards = new BillCard[vos.length]; diff --git a/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl11.java b/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java similarity index 96% rename from ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl11.java rename to ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java index 91317c6..373de2a 100644 --- a/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl11.java +++ b/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java @@ -51,7 +51,7 @@ import nccloud.pubitf.ic.outbound.service.IOutboundTransferVoService1; import java.util.ArrayList; import java.util.List; -public class OutboundTransferVoServiceImpl11 implements IOutboundTransferVoService1 { +public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoService1 { public static final Integer ZERO_INTEGER = 0; private ICContext context = new ICContext() { public String getUserID() { @@ -120,9 +120,10 @@ public class OutboundTransferVoServiceImpl11 implements IOutboundTransferVoServi AggregatedValueObject[] vochange = new AggregatedValueObject[0]; try { - vochange = service.runChangeDataAryNeedClassify(info.getInfo()[0].getCbilltype(), ICBillType.SapplyBill.getCode(), volist, (PfParameterVO) null, -1); - } catch (BusinessException var16) { - ExceptionUtils.wrappBusinessException(var16.getMessage()); + String cbilltype = info.getInfo()[0].getCbilltype(); + vochange = service.runChangeDataAryNeedClassify(cbilltype, ICBillType.SapplyBill.getCode(), volist, (PfParameterVO) null, -1); + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException(e.getMessage()); } vochange = this.addFromSource(vochange); diff --git a/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java b/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java index 9679610..179ae09 100644 --- a/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java +++ b/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java @@ -31,12 +31,13 @@ public class QueryFor4455BP1 extends Abstract422XRefQueryBP1 { wholeSql.append(this.psor.getFinalFromWhere()); // 查询审核通过 wholeSql.append(" AND fbillstatus = 1"); - wholeSql.append(" AND APPROVERTIME > '2024-11-01'"); + // wholeSql.append(" AND APPROVERTIME > '2024-11-01'"); // NCCForUAPLogger.debug("finalFromWhere = " + this.psor.getFinalFromWhere()); wholeSql.append(" ) a"); wholeSql.append(" INNER JOIN mm_pickm_b b ON b.cpickmid = a.cpickmid AND b.dr = 0 "); - // 出库数量>0 - wholeSql.append(" AND ( COALESCE(b.nplanoutastnum, 0) - COALESCE(b.nshouldastnum, 0) - COALESCE(b.npscastnum, 0) - COALESCE(b.naccoutastnum, 0) ) >0 "); + // 未出库数量>0 + wholeSql.append(" WHERE "); + wholeSql.append(" ( COALESCE(b.nplanoutastnum, 0) - COALESCE(b.nshouldastnum, 0) - COALESCE(b.npscastnum, 0) - COALESCE(b.naccoutastnum, 0) ) > 0 "); NCCForUAPLogger.debug("wholeSql = " + wholeSql); return wholeSql; }