From 9aec4562c1b7a32180a5fc34e7ef6cb79beb5c86 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 17:15:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/erp/ErpService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 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 4f03054..bb66ce0 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -38,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;
@@ -85,6 +93,15 @@
     }
 
     /**
+     * 淇敼 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){

--
Gitblit v1.9.1