tudc %!s(int64=3) %!d(string=hai) anos
pai
achega
869862a617

+ 1 - 1
adm/src/main/java/com/minpay/guomao/giveoutmanage/GiveStockManageAction.java

@@ -843,7 +843,7 @@ public class GiveStockManageAction implements IMINAction {
 			ApGiveOut orderLogistics = Service.lookup(IMINDataBaseService.class)
 					.getMybatisMapper(ApGiveOutMapper.class)
 					.selectByPrimaryKey(map.get("agoId"));
-			if(!"0".equals(orderLogistics.getState())) {
+			if(!"00".equals(orderLogistics.getState())) {
 				throw new MINBusinessException("发出量已入库!");
 			}
 			if(orderLogistics == null){

+ 3 - 0
adm/src/main/java/com/minpay/guomao/giveoutmanage/giveOutManageAction.java

@@ -1091,6 +1091,9 @@ public class giveOutManageAction implements IMINAction {
 			if(orderLogistics == null){
 				throw new MINBusinessException("获取发出量信息失败!");
 			}
+			if("02".equals(orderLogistics.getState())) {
+				throw new MINBusinessException("第"+(i+1)+"条数据已入库,不能删除");
+			}
 			//获取StockId
 			String stockId = orderLogistics.getStockId();
 			if(!CommonUtil.isEmpty(stockId)){

+ 2 - 3
adm/src/main/webapp/admin/giveOutManage/giveoutManage.html

@@ -606,13 +606,12 @@ if(!isEmpty(stockId)){
 	    		return;
 			}
 			
-			for(var i = 0 ; i < tableData.length;i++){
-				if(tableData[i].state == '02'){
+			for(var i = 0 ; i < tabData.length;i++){
+				if(tabData[i].state == '02'){
 					layer.msg('第'+(i+1)+"条数据已入库,不能删除", {icon: 5});
 		    		return;
 				}
 			}
-			
 			layer.confirm('是否确认删除?', function(index){
 				$.request({
 					action : 'giveOutManageAction/deleteGiveoutList',