From 4fc0b0e21f4e4e0d33dbf6b57185d1dc971a2fee Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 25 May 2023 18:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PackagingInventoryRecord.java                     |  6 +++---
 .../PackagingInventoryRecordDto.java                  |  2 +-
 .../PackagingInventoryRecordMapper.xml                |  2 +-
 .../PackagingInventoryRecordService.java              | 11 +++++++++++
 .../packagingoutbound/PackagingOutboundService.java   |  2 +-
 .../biz/packagingstorage/PackagingStorageService.java |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java
index dda78887..2c6f3256 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java
@@ -11,14 +11,14 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "包装物盘库记录信息", description = "包装物盘库记录信息")
-@TableName("material_inventory_record")
+@TableName("packaging_inventory_record")
 public class PackagingInventoryRecord extends BaseEntity {
     //盘库日期
     private String inventoryDate;
     //盘库库存
     private double inventory;
-    //包装物类型
-    private String typeSid;
+    //包装物库存sid
+    private String inventorySid;
     //价值
     private double value;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java
index d89f70d8..6f71e6a3 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java
@@ -19,7 +19,7 @@ public class PackagingInventoryRecordDto implements Dto {
     //盘库库存
     private double inventory;
     //包装物类型
-    private String typeSid;
+    private String inventorySid;
     //价值
     private double value;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml
index 36d61b59..04177564 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName;
+        *,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         packaging_inventory_record r
         left join packaging_inventory i on r.inventorySid =i.sid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java
index c6b0e496..bcabd5b6 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java
@@ -1,6 +1,7 @@
 package com.yxt.supervise.cyf.biz.packaginginventoryrecord;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -8,13 +9,18 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventory;
 import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecord;
 import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordDto;
 import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordQuery;
 import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo;
+import com.yxt.supervise.cyf.biz.packaginginventory.PackagingInventoryService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author wangpengfei
  * @date 2023/5/4 14:37
@@ -22,6 +28,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class PackagingInventoryRecordService extends MybatisBaseService<PackagingInventoryRecordMapper, PackagingInventoryRecord> {
 
+    @Autowired
+    PackagingInventoryService packagingInventoryService;
 
     public PagerVo<PackagingInventoryRecordVo> listPageVo(PagerQuery<PackagingInventoryRecordQuery> pq) {
         PackagingInventoryRecordQuery query = pq.getParams();
@@ -42,6 +50,9 @@ public class PackagingInventoryRecordService extends MybatisBaseService<Packagin
         ResultBean rb=new ResultBean();
         PackagingInventoryRecord entity=new PackagingInventoryRecord();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        Date curDate = new Date();
+        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        entity.setInventoryDate(dfmt);
         baseMapper.insert(entity);
         return rb.success().setMsg("新增成功");
     }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java
index 997ca8af..9e7b80c1 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java
@@ -38,7 +38,7 @@ public class PackagingOutboundService extends MybatisBaseService<PackagingOutbou
         PackagingOutboundQuery query = pq.getParams();
         QueryWrapper<PackagingOutbound> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getDate())) {
-            qw.eq("STR_TO_DATE(o.deliverDate,'%Y-%m-%d')", query.getDate());
+            qw.eq("STR_TO_DATE(o.deliveryDate,'%Y-%m-%d')", query.getDate());
         }
         if (StringUtils.isNotBlank(query.getContractNumber())) {
             qw.like("o.salesContractNumber", query.getContractNumber());
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java
index a2d9aec2..94430cdc 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java
@@ -40,7 +40,7 @@ public class PackagingStorageService extends MybatisBaseService<PackagingStorage
             qw.eq("STR_TO_DATE(s.warehousingDate,'%Y-%m-%d')", query.getDate());
         }
         if (StringUtils.isNotBlank(query.getContractNumber())) {
-            qw.like("s.salesContractNumber", query.getContractNumber());
+            qw.like("s.contractNumber", query.getContractNumber());
         }
         IPage<PackagingStorage> page = PagerUtil.queryToPage(pq);
         IPage<PackagingStorageVo> pagging = baseMapper.selectPageVo(page, qw);