装箱单成衣删除bug

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -87,6 +87,7 @@ public class SyPackingListTailoringController {
 								   HttpServletRequest req) {
 		QueryWrapper<SyPackingListTailoringVo> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, req.getParameterMap());
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
+		queryWrapper.eq("a.del_flag","0");
 		IPage<SyPackingListTailoringVo> pageList = syPackingListTailoringService.selectList(page, queryWrapper);
 		return Result.OK(pageList);
 	}
@@ -132,8 +133,9 @@ public class SyPackingListTailoringController {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
 		 queryWrapper.eq("a.del_flag","0");//默认查询未删除
-		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-			 queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+		 //客户简称	款号 分销点	预发货日期	小po	待添加查询条件
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){
+			 queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());//查询id
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
 			 queryWrapper.eq("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号
@@ -366,20 +368,21 @@ public class SyPackingListTailoringController {
 				 for (int i = 0; i < json.size(); i++) {
 					 //获取对象
 					 JSONObject jsonObject = json.getJSONObject(i);
-					 //获取账套
+					 //获取json名
 					 String spapl = jsonObject.get("spapl").toString();
 					 //转list
 					 List<SyPackingListTailoring> syPackingListTailorings=JSONObject.parseArray(spapl,SyPackingListTailoring.class);
 					//生成数据
 					 syPackingListTailoringService.saveList(syPackingListTailorings);
 				 }
+				 result.setSuccess(true);
 				 result.success("操作成功");
 			 }
 		 } catch (Exception e) {
 			 e.printStackTrace();
+			 result.setSuccess(false);
 			 result.error500("操作失败："+e.getMessage());
 		 }
-
 		 return result;
 	 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -11,7 +11,8 @@
 		SELECT * 
 		FROM  sy_packing_list_tailoring_item
 		WHERE
-			 sy_packing_list_tailoring_id = #{id} 		
+			 sy_packing_list_tailoring_id = #{id}
+			 and del_flag=0
 	</select>
 
 	<select id="querySpaplItemId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoringItem">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -17,11 +17,13 @@
         depositary_Receipt_No,
         pre_Delivery_Date,
         order_Type
-        from sy_pre_assembled_packing_list where id=#{value}
+        from sy_pre_assembled_packing_list
+        where id=#{value}
+        and del_flag=0
     </select>
 
     <update id="deleteByMainId" parameterType="java.lang.String">
-        update sy_pre_assembled_packing_list set del_flag='1' where #{value}
+        update sy_packing_list_tailoring set del_flag='1' where id=#{value}
     </update>
     
     <select id="selectList" resultType="org.jeecg.modules.splt.vo.SyPackingListTailoringVo">
@@ -45,7 +47,7 @@
          b.factory_Unit_Price
          FROM sy_packing_list_tailoring a
          LEFT JOIN sy_packing_list_tailoring_item b
-         ON a.id=b.sy_packing_list_tailoring_id
+         ON a.id=b.sy_packing_list_tailoring_id and b.del_flag=0
          ${ew.customSqlSegment}
          GROUP BY a.id
     </select>

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

@@ -63,8 +63,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume);//获取总体积						长*宽*高*箱数
-
+				item1.setTotalVolume(volume);//获取总体积	长*宽*高*箱数
 				item1.setSyPreAssembledPackingListItemId(size.getItemId());//获取到预装箱单子表id
 				item1.setSort(size.getNum());//获取序号
 				item1.setId(oConvertUtils.id());//获取到随机id
@@ -154,6 +153,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			syPackingListTailoringMapper.insert(splt);
 			for (SyPackingListTailoringItem item : splt.getSyPackingListTailoringItemList()){
 				item.setId(null);
+				item.setSyPackingListTailoringId(splt.getId());
 				syPackingListTailoringItemMapper.insert(item);
 			}
 		}