From 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 07 六月 2021 11:10:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/common/service/erp/ErpService.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/ErpService.java b/src/main/java/com/zy/common/service/erp/ErpService.java
index fe5c779..623c72a 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -332,19 +332,6 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
public boolean updateFnumber(Integer itemId, String FNumber){
String sql = "update InStockbillEntry set Fnumber = ''{0}'' where FItemID = {1,number,#}";
sql = MessageFormat.format(sql, FNumber, itemId);
@@ -357,4 +344,18 @@
return erpSqlServer.update(sql) > 0;
}
+ public List<CPICMO> queryErpCPICMO(String fbillNo, String fsourceBillNo) {
+ String sql = "select * from CPICMO";
+ if (!Cools.isEmpty(fbillNo) && Cools.isEmpty(fsourceBillNo)) {
+ sql = "select * from CPICMO where FBillNo = ''{0}''";
+ sql = MessageFormat.format(sql, fbillNo);
+ } else if (Cools.isEmpty(fbillNo) && !Cools.isEmpty(fsourceBillNo)) {
+ sql = "select * from CPICMO where FSourceBillNo = ''{0}''";
+ sql = MessageFormat.format(sql, fsourceBillNo);
+ } else if (!Cools.isEmpty(fbillNo) && !Cools.isEmpty(fsourceBillNo)) {
+ sql = "select * from CPICMO where FBillNo = ''{0}'' and FSourceBillNo = ''{1}''";
+ sql = MessageFormat.format(sql, fbillNo, fsourceBillNo);
+ }
+ return erpSqlServer.select(sql, CPICMO.class);
+ }
}
--
Gitblit v1.9.1