库存明细修改

shkj-wms/src/main/java/com/shkj/wms/vo/SysStockNumDetailVo.java

@@ -21,36 +21,32 @@ public class SysStockNumDetailVo implements Serializable {
 
 	private String branchName;
 	/**
-	 * 所在楼层
+	 * 所在巷道
 	 */
 
-	private String layer;
+	private String tunnel;
 	/**
 	 * 库位
 	 */
 	private String locationCode;
 	/**
-	 * 台车编号
+	 * 治具编号
 	 */
 	private String containerCode;
 	/**
-	 * 物料编号
+	 * 保险杠条码
 	 */
-	private String ptPart;
+	private String qrCode;
 
 	/**
-	 * 物料名称
+	 * 车型
 	 */
-	private String ptName;
-	/**
-	 * 规格
-	 */
-	private String ptDesc;
+	private String vehicheModel;
 
 	/**
-	 * 机种（即车型）
+	 * 颜色
 	 */
-	private String ptBreakCat;
+	private String color;
 
 	/**
 	 * 在库数量
@@ -81,7 +77,7 @@ public class SysStockNumDetailVo implements Serializable {
 	/**
 	 * 批次
 	 */
-	private String rerpDate;
+	private String batch;
 
 	/**
 	 * 作业时间
@@ -93,24 +89,6 @@ public class SysStockNumDetailVo implements Serializable {
 	 */
 	private String type ;
 
-	/**
-	 * 批次
-	 */
-	private String batch;
 
-	/**
-	 * 开始时间之前的所有入库
-	 */
-	private Integer invInqty;
-
-	/**
-	 * 开始时间之前的所有出库
-	 */
-	private Integer invOutqty;
-
-	/**
-	 * 可用数量
-	 */
-	private  Integer useQty;
 
 }

shkj-wms/src/main/resources/mapper/wms/SysStockMapper.xml

@@ -164,15 +164,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <select id="queryStockDetailList" resultType="com.shkj.wms.vo.SysStockNumDetailVo" parameterType="com.shkj.wms.bo.SysStockNumQueryBo">
                 SELECT
-                item.goods_no,
+                item.color,
+                item.vehiche_model,
                 group_concat( stock.qr_code) as qr_code,
                 stock.qty,
-                IFNULL( qty, 0 )+ IFNULL( in_qty, 0 )- IFNULL( out_qty, 0 ) AS useQty,
-                IFNULL( in_qty, 0 ) AS in_qty,
-                IFNULL( out_qty, 0 ) AS out_qty,
                 DATEDIFF( curtime(), stock.batch ) AS storageAge,
-                branch.branch_name,
-                loc.layer,
+                loc.tunnel,
                 loc.location_code,
                 con.container_code,
                 stock.batch
@@ -199,7 +196,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                 and  con.container_code= #{containerCode}
                         </if>
                 </where>
-                order by loc.location_name
+                GROUP BY
+                item.color,
+                item.vehiche_model,
+                stock.qty,
+                storageAge,
+                loc.tunnel,
+                loc.location_code,
+                con.container_code,
+                stock.batch
 
         </select>