修改预装箱单面料

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -543,11 +543,11 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 				 result.setSuccess(false);
 				 return result;
 			 }
-			 if(syPreAssembledPackingList2.getPushStatus().equals("1")||syPreAssembledPackingList2.getIsReference()>0){
+/*			 if(syPreAssembledPackingList2.getPushStatus().equals("1")||syPreAssembledPackingList2.getIsReference()>1){
 				 result.setMessage("已推送云工厂或已被下游参照!");
 				 result.setSuccess(false);
 				 return result;
-			 }
+			 }*/
 			 syPreAssembledPackingList2.setStatus("0");//修改为取消提交状态
 			 boolean bool= syPreAssembledPackingListService.updateById(syPreAssembledPackingList2);//修改提交状态
 			 if(bool==true){

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

@@ -21,6 +21,8 @@ public interface SyPreAssembledPackingListMapper extends BaseMapper<SyPreAssembl
 
    SyPreAssembledPackingList  selectSyShippingDetailsData(String id);
 
+   SyPreAssembledPackingList  selectByOneId(String id);
+
    Integer deleteId(String id);
 
    IPage<SyPreAssembledPackingListVo> selectPage(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);

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

@@ -4,7 +4,7 @@
     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
     /*获取发运明细数据*/
     SELECT t.*,
-	 (SELECT product_Name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
+	 (SELECT declaration_name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
 	 (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) english_product_name
     FROM (
     SELECT
@@ -45,14 +45,14 @@
         a.document_No,/*单据号*/
         a.order_number,/*订单号*/
         a.item_number, /*款号*/
-	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) english_product_name ,/*中文品名*/
+	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*中文品名*/
 	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
         a.size_range,/*尺码范围*/
         a.customer,/*客户名称*/
         a.container_code,/*集装箱号*/
         a.container_number,/*集装箱代号*/
         a.u8_remarks,/*备注*/
-        a.garment_factory,/*成衣工厂*/
+        b.garment_factory,/*成衣工厂*/
         a.depositary_receipt_no,/*预托书号*/
         a.memo,/*备注*/
         a.order_type,/*订单类型*/
@@ -84,6 +84,17 @@
     ORDER BY a.`update_time` DESC
 	</select>
 
+    <select id="selectByOneId" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList" parameterType="java.lang.String">
+        select
+        t.*,
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) englishProductName ,/*中文品名*/
+        (SELECT declaration_name FROM  sy_declaration_elements WHERE id=t.elements_id) productName/*英文品名*/
+        from(SELECT
+                *
+        FROM Sy_Pre_Assembled_Packing_List
+        where id=#{value }) t
+    </select>
+
     <update id="deleteId" parameterType="java.lang.String">
     update sy_pre_assembled_packing_list set del_flag='1' where
     id=#{value}

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

@@ -349,6 +349,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectOne(queryWrapper);
 		if(syPreAssembledPackingList!=null&&syPreAssembledPackingList.getId()!=null)
 		syPreAssembledPackingList.setSizeTables(syPreAssembledPackingListItemMapper.querySizes2(syPreAssembledPackingList.getId()));
+		SyPreAssembledPackingList syPreAssembledPackingList2=syPreAssembledPackingListMapper.selectByOneId(syPreAssembledPackingList.getId());
+		syPreAssembledPackingList.setEnglishProductName(syPreAssembledPackingList2.getEnglishProductName());
+		syPreAssembledPackingList.setProductName(syPreAssembledPackingList2.getProductName());
 		return syPreAssembledPackingList;
 	}
 
@@ -403,6 +406,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				main.setCustomerAbbreviation(syItem.getCustomerAbbreviation());//客户简称
 				main.setOrderNumber(syItem.getOrderNumber());//修改订单号
 				main.setSpurOrSubOrder(syItem.getPurOrSubOrder());//修改委外订单号
+				main.setElementsId(syItem.getElementsId());//获取申报要素id
 				main.setOmpoId(syItem.getOmpoId());//修改委外订单id
 				syPreAssembledPackingListMapper.updateById(main);
 			}

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

@@ -80,8 +80,9 @@ public class SyPackingListFabricController {
 								   HttpServletRequest req) {
 		Result<IPage<SyPackingListFabric>> result= new Result();
 		QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, req.getParameterMap());
+		queryWrapper.eq("a.del_flag","0");
 		Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(pageNo, pageSize);
-		IPage<SyPackingListFabric> pageList = syPackingListFabricService.page(page, queryWrapper);
+		IPage<SyPackingListFabric> pageList = syPackingListFabricService.selectPage(page, queryWrapper);
 		return result.OK(pageList);
 	}
 
@@ -121,14 +122,13 @@ public class SyPackingListFabricController {
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
 			 queryWrapper.le("t.preDeliveryDate",endDate);
 		 }
-
-/*		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
+		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
 			 if(status.equals("n")){
 				 queryWrapper.ge("t.excess_quantity",0);//大于等于--超发
 			 }else{
 				 queryWrapper.le("t.excess_quantity",-1);//小于等于--正常
 			 }
-		 }*/
+		 }
 		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
 		 IPage<SyShippingDetailsVo> pageList = syPackingListFabricService.queryShippingDetails(page, queryWrapper);
 		 result.setSuccess(true);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -113,6 +113,10 @@ public class SyPackingListFabric implements Serializable {
 	@Excel(name = "数量", width = 15)
 	@ApiModelProperty(value = "数量")
 	private java.math.BigDecimal quantity;
+	/**分组id*/
+	@TableField(exist = false)
+	@ApiModelProperty(value = "分组id")
+	private String groupId;
 	/**子表数据*/
 	@TableField(exist = false)
 	@ApiModelProperty(value = "子表数据")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -29,6 +29,9 @@ public class SyPackingListFabricItem implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
 	@ApiModelProperty(value = "id")
 	private String id;
+	/**订单号*/
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
 	/**装箱单面料主表id*/
 	@ApiModelProperty(value = "装箱单面料主表id")
 	private String syPackingListFabricId;

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.spapl.vo.SyPreAssembledPackingListVo;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -22,6 +23,11 @@ public interface SyPackingListFabricMapper extends BaseMapper<SyPackingListFabri
     //根据id获取发运明细数据
     public List<SyPackingListFabric> getSyShippingDetailsData(@Param("ids") String[] ids);
 
+    //根据id获取发运明细数据
+    public SyPackingListFabric selectById2(@Param("id") String id,@Param("groupId") String groupId);
+
     //将该单据修改成删除状态
     public int deleteByMainId(String id);
+
+    IPage<SyPackingListFabric> queryMain(IPage<SyPackingListFabric> page, @Param("ew") QueryWrapper<SyPackingListFabric> queryWrapper);
 }

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

@@ -22,6 +22,7 @@
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
+			b.order_Number,/*订单号*/
 			b.colour,/*颜色*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
@@ -82,11 +83,12 @@
 		</foreach>
 	</select>
 
-	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
+<!--	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT
 			*
 		FROM `sy_packing_list_fabric_item`
 		where del_flag=0 and
 		sy_packing_list_fabric_id=#{value}
-	</select>
+	</select>-->
+
 </mapper>

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

@@ -89,4 +89,29 @@
         update sy_packing_list_fabric set del_flag='1' where id =#{value}
     </update>
 
+    <select id="queryMain" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
+		SELECT
+			a.*,
+			b.group_id
+		FROM `sy_packing_list_fabric` a
+		left join sy_packing_list_fabric_item b
+		on a.id=b.sy_packing_list_fabric_id
+		and b.del_flag
+		${ew.customSqlSegment}
+		group by a.id
+	</select>
+
+    <select id="selectById2" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
+		SELECT
+			a.*,
+			b.group_id
+		FROM `sy_packing_list_fabric` a
+		left join sy_packing_list_fabric_item b
+		on a.id=b.sy_packing_list_fabric_id
+		and b.del_flag
+		where a.id=#{id }
+		and b.group_id=#{groupId }
+		group by a.id
+	</select>
+
 </mapper>

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.splfi.service;
 
 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.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
@@ -56,4 +57,8 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	//根据id获取主表子表汇总数据
 	public SyPackingListFabric selectById(String id);
 
+	//分页查询
+	IPage<SyPackingListFabric> selectPage(IPage<SyPackingListFabric> page,QueryWrapper<SyPackingListFabric> queryWrapper);
+
+
 }

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

@@ -45,9 +45,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Override
 	@Transactional
 	public SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric) {
+		SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
+		QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
+		queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
+		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
+		String dateNo ="YCY"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
 		syPackingListFabric.setDelFlag("0");
 		syPackingListFabric.setStatus("0");
-		syPackingListFabric.setDocumentNo(oConvertUtils.getId());//单据号
+		syPackingListFabric.setDocumentNo(dateNo);//单据号
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		for(SyPackingListFabricItem entity:syPackingListFabric.getSyPackingListFabricItem()) {
@@ -133,7 +138,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public  SyPackingListFabric getSyShippingDetailsData(String[] ids) throws ParseException {
 		String time= new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
 		SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
-		syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));
+		syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));//获取制单日期
 		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids));
 		return syPackingListFabric;
 	}
@@ -145,4 +150,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		return syPackingListFabric;
 	}
 
+	@Override
+	public IPage<SyPackingListFabric> selectPage(IPage<SyPackingListFabric> page, QueryWrapper<SyPackingListFabric> queryWrapper) {
+		return syPackingListFabricMapper.queryMain(page,queryWrapper);
+	}
+
 }