成衣和面料添加业务员、业务部门

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

@@ -248,4 +248,9 @@ public class SyPackingListFabricItem implements Serializable {
 	/**申报要素ID*/
 	@ApiModelProperty(value = "申报要素ID")
 	private String elementsId;
+
+	/**业务部门(销售部门)*/
+	//@Excel(name = "业务部门(销售部门)", width = 15)
+	@ApiModelProperty(value = "业务部门(销售部门)")
+	private java.lang.String salesDepartment;
 }

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

@@ -60,6 +60,7 @@
 			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
+			b.sales_Department,/*业务部门*/
 			b.item_Number,/*款号*/
 			b.colour,/*颜色*/
 			b.u8_Remarks memo,/*备注*/

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

@@ -66,9 +66,10 @@
     and b.submit_status=1  /*查询已提交的数据*/
     AND ( inventory_ccode NOT LIKE '19%' OR inventory_ccode IS NULL)/*查询不是成衣的数据*/
     group by a.id,b.group_id
-    ORDER BY a.document_no DESC
+   /* ORDER BY a.document_no DESC*/
     ) AS t
     ${ew.customSqlSegment}
+    order by update_time desc /*创建时间倒序*/
     </select>
 
     <select id="getSyShippingDetailsData"  resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">

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

@@ -50,7 +50,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		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();//获取单据号
+		String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
 		syPackingListFabric.setDelFlag("0");
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
@@ -74,6 +74,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			detailsItem.setSurplusQuantity(detailsItem.getSurplusQuantity().subtract(entity.getInventoryQuantity()));
 			//此次入库数量-剩余数量=超发数量
 			detailsItem.setExcessQuantity(entity.getInventoryQuantity().subtract(detailsItem.getSurplusQuantity()));
+			entity.setSalesman(detailsItem.getSalesman());//获取业务员
+			entity.setSalesDepartment(detailsItem.getSalesDepartment());//获取业务部门
 			syShippingDetailsItemMapper.updateById(detailsItem);
 			syPackingListFabricItemMapper.insert(entity);
 		}

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

@@ -1,10 +1,7 @@
 package org.jeecg.modules.splt.controller;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -25,6 +22,8 @@ import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
 import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListService;
 import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
 import org.jeecg.modules.splt.vo.SyPackingListTailoringVo;
+import org.jeecg.modules.system.entity.SysPermission;
+import org.jeecg.modules.system.service.impl.SysPermissionServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -496,15 +495,15 @@ public class SyPackingListTailoringController {
 		 String accessToken = request.getHeader("X-Access-Token");
 		 System.out.println("accessToken的值为:\t"+accessToken);
 		 Result result=new Result();
-		 if(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "yungctest")!=null){
-			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "yungctest"));
-			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "yungctest"));
+		 if(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData")!=null){
+			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "testData"));
+			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData"));
 		 }else{
 			 String token = JwtUtil.sign(username, syspassword);//生成token
-			 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + "yungctest", token);
-			 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + "yungctest", JwtUtil.EXPIRE_TIME * 2 / 1000);
-			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "yungctest"));
-			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "yungctest"));
+			 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + "testData", token);
+			 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + "testData", JwtUtil.EXPIRE_TIME * 2 / 1000);
+			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "testData"));
+			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData"));
 		 }
 		 return result;
 	 }
@@ -570,4 +569,5 @@ public class SyPackingListTailoringController {
 		}
 		return result;
 	 }
-}
+
+ }

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

@@ -281,4 +281,13 @@ public class SyPackingListTailoringItem implements Serializable {
 	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
 
+	/**业务员*/
+	//@Excel(name = "业务员", width = 15)
+	@ApiModelProperty(value = "业务员")
+	private java.lang.String salesman;
+
+	/**业务部门(销售部门)*/
+	//@Excel(name = "业务部门(销售部门)", width = 15)
+	@ApiModelProperty(value = "业务部门(销售部门)")
+	private java.lang.String salesDepartment;
 }

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

@@ -61,6 +61,8 @@
 			ompo_Account,/*采购委外账套号*/
 			ompo_Id,/*采购委外订单主表id*/
 			ompo_Id_Item,/*采购委外订单子表id*/
+			salesman,/*业务员*/
+			sales_Department,/*业务部门*/
 			ymoney,/*佣金*/
 			group_id
 		FROM  sy_pre_assembled_packing_list_item

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

@@ -87,6 +87,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				item1.setId(oConvertUtils.id());//获取到随机id
 				SyPreAssembledPackingListItem syPreItem=syPreAssembledPackingListItemMapper.selectById(item.getSyPreAssembledPackingListItemId());//获取预装箱单数据
 				syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
+				item1.setSalesman(syPreItem.getSalesman());//获取业务员
+				item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 				syPreAssembledPackingListItemMapper.updateById(syPreItem);//修改剩余数量
 				syPackingListTailoringItemMapper.insert(item1);//添加子表数据
 			}