From d5f446da1b638fe1024c35f9732e72c12d71f1f8 Mon Sep 17 00:00:00 2001
From: baiXiao8813 <516776535@qq.com>
Date: 星期二, 27 七月 2021 14:14:37 +0800
Subject: [PATCH] 立库日入库、出库导出列顺序调整

---
 src/main/java/com/zy/common/service/erp/ErpService.java |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 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..de28db0 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -228,14 +228,14 @@
 
     /**
      * 搴撳瓨鐩樼偣
-     * @param FItemID 鐗╂枡鍐呯爜
+     * @param FNumber 鐗╂枡鍐呯爜
      * @param qty 鏁伴噺锛堟琛ㄧず鐩樼泩銆佽礋琛ㄧず鐩樹簭锛�
      */
-    public boolean checkStockEntity(Integer FItemID, Integer FEntryID, Double qty){
-        String sql = "insert [dbo].[StockCheckRecord] ([FItemID],[FEntryID], [CheckQty],[Fflag_rw],[Fflag_finish]) values ({0,number,#}, {1,number,#}, {2,number,#}, 0, 0);";
-        sql = MessageFormat.format(sql, FItemID, FEntryID, qty);
+    public boolean checkStockEntity(String FNumber, Double qty){
+        String sql = "insert [dbo].[StockCheckRecord] ([FNumber],[CheckQty],[Fflag_rw],[Fflag_finish],[sync_id]) values (''{0}'', {1,number,#}, 0, 0, -1);";
+        sql = MessageFormat.format(sql, FNumber, qty);
         if (erpSqlServer.update(sql) == 0) {
-            log.error("{}鏂板鐩樼偣璁板綍澶辫触", FItemID);
+            log.error("{}鏂板鐩樼偣璁板綍澶辫触", FNumber);
             return false;
         }
         return true;
@@ -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