zy-asrs.git - Gitblit

			@@ -173,18 +173,21 @@
			* 备用1(PO)
			*/
			@ApiModelProperty(value= "备用1")//PO
			@ExcelProperty("客户PO")
			private String standby1 = "1";

			/**
			* 备用2(UPC)
			*/
			@ApiModelProperty(value= "备用2")//UPC
			@ExcelProperty("条码UPC")
			private String standby2 = "1";

			/**
			* 备用3(SKU)
			*/
			@ApiModelProperty(value= "备用3")//SKU
			@ExcelProperty("客户SKU")
			private String standby3 = "1";

			/**
			@@ -192,6 +195,7 @@
			*/
			@ApiModelProperty(value= "备用1")
			@TableField("box_type1")
			@ExcelProperty("货主")
			private String boxType1 = "1";

			/**
			@@ -206,6 +210,7 @@
			*/
			@ApiModelProperty(value= "备用3")
			@TableField("box_type3")
			@ExcelProperty("采购单号")
			private String boxType3 = "1";

			/**

			@@ -414,9 +414,15 @@
			ROW_NUMBER() over (order by sum(a.anfme) desc) as row
			, a.matnr
			, sum(a.anfme) as anfme
			, a.order_no as orderNo
			, a.standby1
			, a.standby2
			, a.standby3
			, a.box_type1 as boxType1
			, a.box_type3 as boxType3
			from asr_loc_detl a
			where 1=1
			group by a.matnr
			group by a.matnr,a.order_no,a.box_type3,a.standby1,a.standby2,a.standby3,a.box_type1
			</select>

			<select id="selectPakoutByRule" resultMap="BaseResultMap">

			@@ -234,7 +234,7 @@
			,{field: 'anfme', align: 'center',title: '数量', hide: false}
			,{field: 'zpallet', align: 'center',title: '托盘条码', hide: false}

			// ,{field: 'specs', align: 'center',title: '规格', hide: true}
			,{field: 'boxType3', align: 'center',title: '采购单号', hide: true}
			// ,{field: 'model', align: 'center',title: '代码', hide: true}
			// ,{field: 'color', align: 'center',title: '颜色', hide: true}
			// ,{field: 'brand', align: 'center',title: '品牌', hide: true}

	src/main/java/com/zy/asrs/entity/LocDetl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/LocDetlMapper.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/common.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史