zy-asrs.git - Gitblit

			@@ -5,6 +5,7 @@
			import com.baomidou.mybatisplus.annotations.TableField;
			import com.core.common.Cools;
			import com.core.common.SpringUtils;
			import com.zy.asrs.service.LocOwnerService;
			import com.zy.common.utils.Synchro;
			import com.zy.system.entity.User;
			import com.zy.system.service.UserService;
			@@ -31,6 +32,10 @@
			private Date createTime;
			@ExcelProperty("规格")
			private String specs;
			@ExcelProperty("批次")
			private String batch;
			@ExcelProperty("货主")
			private String owner;
			@ExcelProperty("库存上限")
			private String inventoryMax;
			@ExcelProperty("库存下限")
			@@ -49,6 +54,15 @@
			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
			}

			public String getOwner$(){
			LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
			LocOwner locOwner = service.selectById(this.owner);
			if (!Cools.isEmpty(locOwner)){
			return String.valueOf(locOwner.getOwner());
			}
			return null;
			}

			public void sync(Object source) {
			Synchro.Copy(source, this);
			}

			@@ -688,16 +688,17 @@
			FROM
			(
			SELECT
			loc_no,
			DISTINCT loc_no,
			locd.matnr,
			locd.maktx,
			locd.owner,
			locd.batch,
			create_time,
			locd.specs,
			locd.unit,
			inventory_max,
			inventory_min,
			inventory_age_max,
			count_anfme,
			DATEDIFF( DAY, create_time, GETDATE( ) ) AS [diff_time]
			FROM
			man_loc_detl locd
			@@ -713,7 +714,7 @@
			count_anfme
			FROM
			man_mat
			RIGHT JOIN ( SELECT matnr, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr ) aa ON aa.matnr = man_mat.matnr
			RIGHT JOIN ( SELECT matnr,batch,owner, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr,batch,owner ) aa ON aa.matnr = man_mat.matnr
			) warn ON locd.matnr = warn.matnr
			WHERE
			DATEDIFF( DAY, create_time, GETDATE( ) ) > inventory_age_max
			@@ -735,16 +736,17 @@
			FROM
			(
			SELECT
			loc_no,
			DISTINCT loc_no,
			locd.matnr,
			locd.maktx,
			locd.owner,
			locd.batch,
			create_time,
			locd.specs,
			locd.unit,
			inventory_max,
			inventory_min,
			inventory_age_max,
			count_anfme,
			DATEDIFF( DAY, create_time, GETDATE( ) ) AS [diff_time]
			FROM
			man_loc_detl locd
			@@ -760,7 +762,7 @@
			count_anfme
			FROM
			man_mat
			RIGHT JOIN ( SELECT matnr, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr ) aa ON aa.matnr = man_mat.matnr
			RIGHT JOIN ( SELECT matnr,batch,owner, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr,batch,owner ) aa ON aa.matnr = man_mat.matnr
			) warn ON locd.matnr = warn.matnr
			WHERE
			DATEDIFF( DAY, create_time, GETDATE( ) ) > inventory_age_max

			@@ -38,6 +38,7 @@
			,{field: 'createTime$', align: 'center',title: '入库时间'}
			,{field: 'specs', align: 'center',title: '规格'}
			,{field: 'batch', align: 'center',title: '批次'}
			,{field: 'owner$', align: 'center',title: '货主'}

			]
			],

	src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/LocDetlMapper.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/locDetlWarning/locDetlWarning.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史