装箱单 提交逻辑修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -406,10 +406,11 @@ return null;
 			for (String id : ids){
 				SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.selectById(id);
 				if (syPackingListFabric.getIsReference()>0){//至少已被参照的数据进行查询
-					SyShippingOrder syShippingOrder=syPackingListFabricMapper.querySyShippingOrder(id);
+					str+=id+",";
+					/*SyShippingOrder syShippingOrder=syPackingListFabricMapper.querySyShippingOrder(id);
 					if(syShippingOrder!=null){
 						str+=id+",";
-					}
+					}*/
 				}
 				syPackingListFabric.setStatus("0");//取消提交
 				syPackingListFabricMapper.updateById(syPackingListFabric);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -141,7 +141,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					continue;
 				}
 				syPackingListTailoringItemMapper.updateById(item1);
-				typeConversion(item1);//调用方法同步修改托书数据
+			//	typeConversion(item1);//调用方法同步修改托书数据
 
 			}
 		}
@@ -395,6 +395,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 	}
 
+	/**
+	 * 取消提交
+	 * @param ids
+	 * @return
+	 */
 	@Override
 	@Transactional
 	public String cancelSubmitBatch(String[] ids) {
@@ -403,15 +408,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			for (String id : ids){
 				SyPackingListTailoring syPackingListTailoring=syPackingListTailoringMapper.selectById(id);
 				if (syPackingListTailoring.getIsReference()>0){//至少已被参照的数据进行查询
-					SyShippingOrder syShippingOrder=syPackingListTailoringMapper.querySyShippingOrder(id);
+					str+=id+",";//不能取消提交
+					/*SyShippingOrder syShippingOrder=syPackingListTailoringMapper.querySyShippingOrder(id);
 					if(syShippingOrder!=null){
-						str+=id+",";
-					}
+					}*/
 				}
 				syPackingListTailoring.setStatus("0");//取消提交
 				syPackingListTailoringMapper.updateById(syPackingListTailoring);
 			}
-			System.out.println("str的长度为:\t"+str.length());
 			if(str.length()>0){
 				throw new JeecgBootException("已被托书参照并提交");
 			}