装箱单成衣单据号调整

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

@@ -169,7 +169,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syItem.setExcessQuantity(total.subtract(syItem.getShipmentQuantity()));
 				//标识已被参照
 				//syItem.setIsReference(1);
-				syShippingDetailsItemMapper.updateById(syItem);//修改发运明细发货数量和超出数量
+				syShippingDetailsItemMapper.updateById(syItem);//修改发运明细发货数量和超出数量,如不需要就注释
 				typeConversion(item1);//修改预托书数量
 			}
 		}

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

@@ -87,9 +87,14 @@ public class SyPackingListTailoringController {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		String orderNumber=syPackingListTailoringVo.getOrderNumber();//获取订单号
+		syPackingListTailoringVo.setOrderNumber(null);//获取订单号
 		QueryWrapper<SyPackingListTailoringVo> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, req.getParameterMap());
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
+		if(oConvertUtils.isNotEmpty(orderNumber)){
+			queryWrapper.eq("a.order_number",orderNumber);//查询订单号
+		}
 		IPage<SyPackingListTailoringVo> pageList = syPackingListTailoringService.selectList(page, queryWrapper);
 		return Result.OK(pageList);
 	}
@@ -549,4 +554,20 @@ public class SyPackingListTailoringController {
 		 result.setMessage("未开发完，测试用");
 		 return result;
 	 }
+
+	 @AutoLog(value = "获取数据")
+	 @ApiOperation(value="获取数据", notes="获取数据")
+	 @GetMapping(value = "/getPreData")
+	 public Result getOrderNumber() {
+	 	Result result=new Result();
+	 	try{
+			syPackingListTailoringService.getOrderNumber();
+	 		result.setMessage("成功获取数据");
+	 		result.setSuccess(true);
+		}catch (Exception e){
+	 		result.setMessage("报错原因:"+e.getMessage());
+			result.setSuccess(false);
+		}
+		return result;
+	 }
 }

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

@@ -280,4 +280,5 @@ public class SyPackingListTailoringItem implements Serializable {
 	//订单号
 	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
+
 }

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

@@ -19,9 +19,9 @@ import java.util.List;
 public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTailoring> {
     public SyPackingListTailoring querySpaplId(String id);
 
-    public SyPackingListTailoring getId(String id);
+    public SyPackingListTailoring getMainId(String id);
 
     public void deleteByMainId(String id);
 
-    public IPage<SyPackingListTailoringVo> selectList(IPage<SyPackingListTailoringVo> page, @Param("ew") QueryWrapper<SyPackingListTailoringVo> queryWrapper);
+    public IPage<SyPackingListTailoringVo> selectList2(IPage<SyPackingListTailoringVo> page, @Param("ew") QueryWrapper<SyPackingListTailoringVo> queryWrapper);
 }

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

@@ -42,7 +42,7 @@
         update sy_packing_list_tailoring set del_flag='1' where id=#{value}
     </update>
     
-    <select id="selectList" resultType="org.jeecg.modules.splt.vo.SyPackingListTailoringVo">
+    <select id="selectList2" resultType="org.jeecg.modules.splt.vo.SyPackingListTailoringVo">
        SELECT
          a.id,
          a.sy_pre_assembled_packing_list_id,
@@ -95,10 +95,10 @@
          ON a.id=b.sy_packing_list_tailoring_id and b.del_flag=0
          ${ew.customSqlSegment}
          GROUP BY a.id
-         order by a.create_time
+         order by a.create_time desc /*倒序*/
     </select>
 
-    <select id="getId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
+    <select id="getMainId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
        select a.id,
          a.sy_pre_assembled_packing_list_id,
          a.document_No ,

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

@@ -71,4 +71,7 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 
 	//类型转换
 	public SyShippingOrderItem typeConversion(SyPackingListTailoringItem syPackingListTailoringItem);
+
+	//同步上游数据
+	SyPackingListTailoring getOrderNumber();
 }

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

@@ -156,8 +156,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		//SyPackingListTailoring.setDocumentNo(oConvertUtils.id());//随机单据号
 		syPackingListTailoring.setDelFlag("0");//删除状态默认为0
 		syPackingListTailoring.setPushState("0");//推送状态默认为0
-		syPackingListTailoring.setStatus("0");//单据装态默认为0
-		syPackingListTailoring.setOrderNumber(randomStr());//订单号
+		syPackingListTailoring.setStatus("0");//单据状态默认为0
+		syPackingListTailoring.setDocumentNo(randomStr());//单据号
 		syPackingListTailoringMapper.insert(syPackingListTailoring);//往主表添加数据
 		UpdateWrapper updateWrapper=new UpdateWrapper();
 		updateWrapper.set("is_Reference","2");//已被预装箱单参照,装箱单不能取消提交
@@ -294,7 +294,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 	@Override
 	public IPage<SyPackingListTailoringVo> selectList(IPage<SyPackingListTailoringVo> page, QueryWrapper<SyPackingListTailoringVo> queryWrapper) {
-		return syPackingListTailoringMapper.selectList(page,queryWrapper);
+		return syPackingListTailoringMapper.selectList2(page,queryWrapper);
 	}
 
 	//简单的排序
@@ -337,4 +337,24 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		//BeanUtils.copyProperties(syPackingListTailoringItem, syShippingOrderItem);
 		return syShippingOrderItem;
 	}
+
+	@Override
+	@Transactional
+	public SyPackingListTailoring getOrderNumber() {
+		QueryWrapper queryWrapper=new QueryWrapper();//sy_pre_assembled_packing_list_id
+		queryWrapper.isNotNull("sy_Pre_Assembled_Packing_List_Id");//预装箱单id不为空
+		List<SyPackingListTailoring>  syPackingListTailorings=syPackingListTailoringMapper.selectList(queryWrapper);
+		for (SyPackingListTailoring item : syPackingListTailorings){
+			//获取数据
+			SyPreAssembledPackingList item1=syPreAssembledPackingListMapper.selectById(item.getSyPreAssembledPackingListId());
+			if(item1==null){
+				continue;//退出本次循环
+			}
+			System.out.println("item1的ordernumber为:\t"+item1.getOrderNumber());
+			item.setDocumentNo(item.getOrderNumber());
+			item.setOrderNumber(item1.getOrderNumber());//赋值销售订单号
+			syPackingListTailoringMapper.updateById(item);
+		}
+		return null;
+	}
 }