nc推送修改;
This commit is contained in:
+5
-2
@@ -278,7 +278,9 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
|||||||
}
|
}
|
||||||
String invoiceItem1 = item1.getInvoiceItem();
|
String invoiceItem1 = item1.getInvoiceItem();
|
||||||
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
||||||
item.setDef29(invoiceItem1);
|
String[] split = invoiceItem1.split(",");
|
||||||
|
item.setDef29(split[0]);
|
||||||
|
//item.setDef29(invoiceItem1);
|
||||||
}
|
}
|
||||||
item.setTaxcodeid("ZL01");
|
item.setTaxcodeid("ZL01");
|
||||||
item.setInvoiceno(invoiceNumber);
|
item.setInvoiceno(invoiceNumber);
|
||||||
@@ -564,7 +566,8 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
|||||||
}
|
}
|
||||||
String invoiceItem1 = firstItem.getInvoiceItem();
|
String invoiceItem1 = firstItem.getInvoiceItem();
|
||||||
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
||||||
item.setDef29(invoiceItem1);
|
String[] split = invoiceItem1.split(",");
|
||||||
|
item.setDef29(split[0]);
|
||||||
}
|
}
|
||||||
item.setPk_currtype(settlementCurrencyNcCode);
|
item.setPk_currtype(settlementCurrencyNcCode);
|
||||||
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
||||||
|
|||||||
+6
-2
@@ -1592,7 +1592,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
}
|
}
|
||||||
String invoiceItem1 = firstItem.getInvoiceItem();
|
String invoiceItem1 = firstItem.getInvoiceItem();
|
||||||
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
||||||
item.setDef29(invoiceItem1);
|
String[] split = invoiceItem1.split(",");
|
||||||
|
item.setDef29(split[0]);
|
||||||
|
//item.setDef29(invoiceItem1);
|
||||||
}
|
}
|
||||||
item.setPk_currtype(settlementCurrencyNcCode);
|
item.setPk_currtype(settlementCurrencyNcCode);
|
||||||
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
||||||
@@ -1876,7 +1878,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
}
|
}
|
||||||
String invoiceItem1 = firstItem.getInvoiceItem();
|
String invoiceItem1 = firstItem.getInvoiceItem();
|
||||||
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
|
||||||
item.setDef29(invoiceItem1);
|
String[] split = invoiceItem1.split(",");
|
||||||
|
item.setDef29(split[0]);
|
||||||
|
//item.setDef29(invoiceItem1);
|
||||||
}
|
}
|
||||||
item.setPk_currtype(settlementCurrencyNcCode);
|
item.setPk_currtype(settlementCurrencyNcCode);
|
||||||
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SALESMAN_NAME" IS '业务员
|
|||||||
|
|
||||||
COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SETTLEMENT_CURRENCY" IS '结算币种';
|
COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SETTLEMENT_CURRENCY" IS '结算币种';
|
||||||
|
|
||||||
COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SALESMAN_ID" IS '业务员id'
|
COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SALESMAN_ID" IS '业务员id';
|
||||||
|
|
||||||
ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "BILLING_JSON" CLOB;
|
ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "BILLING_JSON" CLOB;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user