From 02c74d142c9623aaa44fe8bca02070eb2c539a1b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 十二月 2022 16:16:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/erp/ErpService.java |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 7 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 8c17af7..e26992c 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -1,6 +1,7 @@
 package com.zy.common.service.erp;
 
 import com.core.common.Cools;
+import com.core.common.DateUtils;
 import com.zy.common.service.erp.dto.VoucherDto;
 import com.zy.common.service.erp.entity.Goods;
 import com.zy.common.service.erp.entity.Voucher;
@@ -12,6 +13,7 @@
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,20 +38,28 @@
         return erpSqlServer.select(sql, Goods.class);
     }
 
+    public Goods selectGoodsOne(String barCode) {
+        String sql = "select top 1 * from Goods where BarCode = '" + barCode + "'";
+        List<Goods> select = erpSqlServer.select(sql, Goods.class);
+        if (Cools.isEmpty(select)) {
+            return null;
+        } else {
+            return select.get(0);
+        }
+    }
+
     public List<VoucherDto> selectOrder(Integer state) {
         List<VoucherDto> list = new ArrayList<>();
         List<Voucher> voucherList = this.selectVoucher(state);
         if (!Cools.isEmpty(voucherList)) {
             for (Voucher voucher : voucherList) {
+                VoucherDto dto = new VoucherDto();
+                dto.setVoucher(voucher);
                 List<VoucherDetail> voucherDetails = this.selectVoucherDetail(voucher.getVoucherID());
                 if (!Cools.isEmpty(voucherDetails)) {
-                    VoucherDto dto = new VoucherDto();
-                    list.add(dto);
-                    dto.setVoucher(voucher);
                     dto.setDetails(voucherDetails);
-                } else {
-                    log.error("{}鍗曟嵁鎵句笉鍒版槑缁嗭紝璇锋敞鎰忔鏌�", voucher.getVoucherID());
                 }
+                list.add(dto);
             }
         }
         return list;
@@ -77,10 +87,49 @@
      * 淇敼 Goods 琛� state
      */
     public boolean updateStateForGoods(String barcode, Integer state){
-        String sql = "update Goods set State = ''{1}'' where BarCode = ''{0}''";
-        sql = MessageFormat.format(sql, barcode, state);
+        String sql = "update Goods set State = ''{1}'', LastUpdatedDate = ''{2}'' where BarCode = ''{0}''";
+        sql = MessageFormat.format(sql, barcode, state, DateUtils.convert(new Date()));
         return erpSqlServer.update(sql) > 0;
     }
 
+    /**
+     * 淇敼 Goods 琛� state, location
+     */
+    public boolean updateStateAndLocForGoods(String barcode, Integer state, String loc){
+        String sql = "update Goods set State = ''{1}'', LastUpdatedDate = ''{2}'', Location = ''{3}'' where BarCode = ''{0}''";
+        sql = MessageFormat.format(sql, barcode, state, DateUtils.convert(new Date()), loc);
+        return erpSqlServer.update(sql) > 0;
+    }
+
+    /**
+     * 淇敼 Voucher 琛� state
+     */
+    public boolean updateStateForVoucher(String voucherID, Integer state){
+        String sql = "update Voucher set State = ''{1}'', LastUpdatedDate = ''{2}'' where VoucherID = ''{0}''";
+        sql = MessageFormat.format(sql, voucherID, state, DateUtils.convert(new Date()));
+        return erpSqlServer.update(sql) > 0;
+    }
+
+    /**
+     * 淇敼 VoucherDetail 琛�
+     */
+    public boolean updateTimeForVoucherDetail(String voucherID){
+        String sql = "update VoucherDetail set LastUpdatedDate = ''{1}'' where VoucherID = ''{0}''";
+        sql = MessageFormat.format(sql, voucherID, DateUtils.convert(new Date()));
+        return erpSqlServer.update(sql) > 0;
+    }
+
+    /**
+     * 鏂板 VoucherDetail 琛�
+     */
+    public boolean insertVoucherDetail(VoucherDetail voucherDetail){
+        String sql = "insert [VoucherDetail] ([VoucherID], [Barcode], [PickID], [LastUpdatedDate]) values (''{0}'', ''{1}'', ''{2}'', ''{3}'');";
+        sql = MessageFormat.format(sql
+                , voucherDetail.getVoucherID()
+                , voucherDetail.getBarcode()
+                , voucherDetail.getPickID()
+                , voucherDetail.getLastUpdatedDate());
+        return erpSqlServer.update(sql) > 0;
+    }
 
 }

--
Gitblit v1.9.1