装箱单bug改动

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/DxpDataPlanMapper.java

@@ -17,4 +17,7 @@ public interface DxpDataPlanMapper extends BaseMapper<DxpDataPlan> {
 
     //回写调用时间
     public void updateLastTime(@Param("time") Date time, @Param("code") String code);
+
+    //回写调用时间
+    public void updateLastTime2(@Param("time") String time, @Param("code") String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/DxpDataPlanMapper.xml

@@ -7,4 +7,7 @@
         update dxp_data_plan set last_time = #{time} where code = #{code}
     </update>
 
+    <update id="updateLastTime2">
+        update dxp_data_plan set last_time = #{time} where code = #{code}
+    </update>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/IDxpDataPlanService.java

@@ -16,4 +16,7 @@ public interface IDxpDataPlanService extends IService<DxpDataPlan> {
     //回写调用时间
     public void updateLastTime(Date time, String code);
 
+    //回写调用时间
+    public void updateLastTime2(String time, String code);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/DxpDataPlanServiceImpl.java

@@ -32,4 +32,9 @@ public class DxpDataPlanServiceImpl extends ServiceImpl<DxpDataPlanMapper, DxpDa
     public void updateLastTime(Date time, String code) {
         dxpDataPlanMapper.updateLastTime(time,code);
     }
+
+    @Override
+    public void updateLastTime2(String time, String code) {
+        dxpDataPlanMapper.updateLastTime2(time,code);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -15,6 +15,7 @@
 			sy_pre_assembled_packing_list_id,
 			sy_declaration_elements_id,
 			sy_order_data_id,
+			item_Code,
 			ac_set_no,
 			garment_factory,
 			hod,
@@ -76,6 +77,7 @@
 		 	sy_shipping_details_item.sy_order_data_id sy_order_data_id,/*订单数据主表id s*/
 		 	sy_shipping_details_item.sy_order_data_item_id sy_order_data_item_id,/*订单数据子表id s*/
             sy_shipping_details_item.pre_delivery_date hod, /*预发货日期 m*/
+			sy_shipping_details_item.pack_Id as item_Code,/*item_code*/
           	sy_shipping_details_item.small_Po poNo, /*pono 发育明细子表订单号 sxx*/
           	sy_shipping_details_item.small_Po small_Po, /*小po*/
 		 	sy_shipping_details_item.account acSetNo,/*单据号 s*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -426,7 +426,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	public SyLetterDepositItem typeConversion(SyPreAssembledPackingListItem syPreAssembledPackingListItem) {
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("sy_pre_assembled_packing_list_item_id",syPreAssembledPackingListItem.getId());
-		SyLetterDepositItem syLetterDepositItem=syLetterDepositItemMapper.selectOne(queryWrapper);
+		SyLetterDepositItem syLetterDepositItem=syLetterDepositItemMapper.selectOne(queryWrapper);//问题点
 		if(syLetterDepositItem!=null){
 			String id=syLetterDepositItem.getId();//保存预托书id防止覆盖
 			BeanUtils.copyProperties(syPreAssembledPackingListItem, syLetterDepositItem);

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

@@ -313,7 +313,10 @@ public class SyPackingListTailoringController {
 	@ApiOperation(value="装箱单成衣-通过id删除", notes="装箱单成衣-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-	    syPackingListTailoringService.delMain(id);
+		if(oConvertUtils.isEmpty(id)){
+			return Result.ok("id为空!");
+		}
+		syPackingListTailoringService.delMain(id);
 		return Result.OK("删除成功!");
 	}
 	

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -186,4 +186,9 @@ public class SyPackingListTailoring implements Serializable {
 	//委外采购Id
 	@ApiModelProperty(value = "委外采购主表Id")
 	private java.lang.String ompoId;
+
+	/**是否被参照(0:无,1:被预托书参照,2:被装箱单参照)*/
+	//@Excel(name = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)", width = 15)
+	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
+	private Integer isReference;
 }

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.splt.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
@@ -217,6 +218,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	@Override
 	@Transactional
 	public void delMain(String id) {
+		SyPackingListTailoring syPackingListTailoring=syPackingListTailoringMapper.selectById(id);
+		if (syPackingListTailoring==null){
+			throw new JeecgBootException("未找到此id！");
+		}
+		if(syPackingListTailoring.getIsReference()==1){
+			throw new JeecgBootException("已被托书参照，禁止删除！");
+		}
 		syPackingListTailoringItemMapper.deleteByMainId(id);
 		syPackingListTailoringMapper.deleteByMainId(id);
 		QueryWrapper queryWrapper=new QueryWrapper();