原料接口修改

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java

@@ -17,8 +17,8 @@ public class MaterialInventoryRecord extends BaseEntity {
     private String inventoryDate;
     //盘库库存
     private double inventory;
-    //物料类型
+    //物料库存sid
-    private String typeSid;
+    private String inventorySid;
     //价值
     private double value;
 

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDetailsVo.java

@@ -18,8 +18,8 @@ public class MaterialInventoryRecordDetailsVo implements Vo {
     private String inventoryDate;
     //盘库库存
     private double inventory;
-    //物料类型
+    //物料库存sid
-    private String typeSid;
+    private String inventorySid;
     //价值
     private double value;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDto.java

@@ -17,8 +17,8 @@ public class MaterialInventoryRecordDto implements Dto {
     private String inventoryDate;
     //盘库库存
     private double inventory;
-    //物料类型
+    //物料库存sid
-    private String typeSid;
+    private String inventorySid;
     //价值
     private double value;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordQuery.java

@@ -18,8 +18,8 @@ public class MaterialInventoryRecordQuery implements Query {
     private String inventoryDate;
     //盘库库存
     private double inventory;
-    //物料类型
+    //物料库存sid
-    private String typeSid;
+    private String inventorySid;
     //价值
     private double value;
     private String date;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundVo.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "油罐信息 视图数据对象", description = "油罐信息 视图数据对象")
+@ApiModel(value = "原料信息 视图数据对象", description = "原料信息 视图数据对象")
 public class MaterialOutboundVo implements Vo {
     private String id;
     private String sid;

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo">
         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
         material_inventory_record r
         left join material_inventory i on r.inventorySid =i.sid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundService.java

@@ -35,7 +35,7 @@ public class MaterialOutboundService extends MybatisBaseService<MaterialOutbound
         MaterialOutboundQuery query = pq.getParams();
         QueryWrapper<MaterialOutbound> 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());

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java

@@ -38,7 +38,7 @@ public class MaterialStorageService extends MybatisBaseService<MaterialStorageMa
             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<MaterialStorage> page = PagerUtil.queryToPage(pq);