面辅料批量提交

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -238,7 +238,63 @@ public class SyPackingListFabricController {
 	 }
 
 	 /**
-	  * 提交
+	  * 批量提交
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "批量提交")
+	 @ApiOperation(value="批量提交", notes="批量提交")
+	 @GetMapping(value = "/submitBatch")
+	 public Result<SyPackingListFabric> submitBatch(@RequestParam(value = "ids",required = true)String[] ids) {
+		 Result<SyPackingListFabric> result=new Result<>();
+		 if(oConvertUtils.isEmpty(ids)){
+			 result.setSuccess(false);
+			 result.setMessage("请至少选中一条单据");
+			 return result;
+		 }
+		 boolean bool=syPackingListFabricService.submitBatch(ids);
+		 if (bool==false){
+			 result.setSuccess(false);
+			 result.setMessage("数据库未找到信息");
+			 return result;
+		 }
+		 result.setSuccess(true);
+		 result.setMessage("成功提交");
+		 return result;
+	 }
+
+	 /**
+	  * 批量取消提交
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "批量取消提交")
+	 @ApiOperation(value="批量取消提交", notes="批量取消提交")
+	 @GetMapping(value = "/cancelSubmitBatch")
+	 public Result<String> cancelSubmitBatch(@RequestParam(value = "ids",required = true)String[] ids) {
+		 Result<String> result=new Result<>();
+		 if(oConvertUtils.isEmpty(ids)){
+			 result.setSuccess(false);
+			 result.setMessage("请至少选中一条单据");
+			 return result;
+		 }
+		 String str=syPackingListFabricService.cancelSubmitBatch(ids);
+		 if(str.length()>0){
+			 result.setMessage("取消提交失败，已被托书参照提交");
+			 result.setResult(str);
+			 result.setCode(111);
+			 result.setSuccess(false);
+			 return result;
+		 }
+		 result.setMessage("取消提交成功");
+		 result.setSuccess(true);
+		 return result;
+	 }
+
+	 /**
+	  * 取消提交
 	  *
 	  * @param id
 	  * @return

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/SyPackingListFabricMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -30,4 +31,6 @@ public interface SyPackingListFabricMapper extends BaseMapper<SyPackingListFabri
     public int deleteByMainId(String id);
 
     IPage<SyPackingListFabric> queryMain(IPage<SyPackingListFabric> page, @Param("ew") QueryWrapper<SyPackingListFabric> queryWrapper);
+
+    public SyShippingOrder querySyShippingOrder(String SyPackingListTailoringId);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -119,4 +119,9 @@
 		group by a.id
 	</select>
 
+    <select id="querySyShippingOrder" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
+        SELECT * FROM Sy_Shipping_Order
+        WHERE ID IN (SELECT sy_Shipping_Order_Item_Id FROM Sy_Shipping_Order_ITEM
+        WHERE tailoring_Fabric_Id=#{value} AND del_flag=0) and the_Documents_State=1
+    </select>
 </mapper>

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

@@ -61,4 +61,8 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	IPage<SyPackingListFabric> selectPage(IPage<SyPackingListFabric> page,QueryWrapper<SyPackingListFabric> queryWrapper);
 
 	void getU8Data();
+
+	boolean submitBatch(String[] ids);
+
+	String cancelSubmitBatch(String[] ids);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElements;
@@ -14,6 +15,7 @@ import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsItemMapper;
 import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsItemServiceImpl;
+import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
@@ -25,6 +27,7 @@ import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricMapper;
 import org.jeecg.modules.splfi.service.ISyPackingListFabricService;
+import org.jeecg.modules.splt.entity.SyPackingListTailoring;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.util.JsonChangeUtils;
 import org.jeecg.modules.system.util.oConvertUtils;
@@ -33,6 +36,8 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -373,4 +378,53 @@ return null;
 		}
 		//return sys;
 	}
+
+	@Override
+	@Transactional
+	public boolean submitBatch(String[] ids) {
+		boolean bool=false;
+		try{
+			for(String id:ids){
+				SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.selectById(id);
+				syPackingListFabric.setStatus("1");//提交
+				syPackingListFabricMapper.updateById(syPackingListFabric);//修改
+			}
+			bool=true;
+		}catch (Exception e){
+			log.error(e.getMessage());
+			bool=false;
+		}finally {
+			return bool;
+		}
+	}
+
+	@Override
+	@Transactional
+	public String cancelSubmitBatch(String[] ids) {
+		String str="";
+		try{
+			for (String id : ids){
+				SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.selectById(id);
+				if (syPackingListFabric.getIsReference()>0){//至少已被参照的数据进行查询
+					SyShippingOrder syShippingOrder=syPackingListFabricMapper.querySyShippingOrder(id);
+					if(syShippingOrder!=null){
+						str+=id+",";
+					}
+				}
+				syPackingListFabric.setStatus("0");//取消提交
+				syPackingListFabricMapper.updateById(syPackingListFabric);
+			}
+			if(str.length()>0){
+				throw new JeecgBootException("已被托书参照并提交");
+			}
+		}catch (Exception e){
+			log.error(e.getMessage());
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
+		}finally {
+			if(str.length()==0){
+				return str;
+			}
+			return str.substring(0,str.length()-1);
+		}
+	}
 }

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

@@ -300,7 +300,7 @@ public class SyPackingListTailoringController {
 		 }
 		 String str=syPackingListTailoringService.cancelSubmitBatch(ids);
 		 if(str.length()>0){
-			 result.setMessage("取消提交失败，已被托书参照并提交");
+			 result.setMessage("取消提交失败，已被托书参照提交");
 			 result.setResult(str);
 			 result.setCode(111);
 			 result.setSuccess(false);