装箱单面料获取销售订单号

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

@@ -47,12 +47,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 装箱单面料
+ * @Description: 装箱单-面辅料
  * @Author: jeecg-boot
  * @Date:   2022-07-27
  * @Version: V1.0
  */
-@Api(tags="装箱单面料")
+@Api(tags="装箱单-面辅料")
 @RestController
 @RequestMapping("/splfi/syPackingListFabric")
 @Slf4j
@@ -71,8 +71,8 @@ public class SyPackingListFabricController {
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "装箱单面料-分页列表查询")
-	@ApiOperation(value="装箱单面料-分页列表查询", notes="装箱单面料-分页列表查询")
+	@AutoLog(value = "装箱单-面辅料-分页列表查询")
+	@ApiOperation(value="装箱单-面辅料-分页列表查询", notes="装箱单-面辅料-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<SyPackingListFabric>> queryPageList(SyPackingListFabric syPackingListFabric,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -181,8 +181,8 @@ public class SyPackingListFabricController {
 	 * @param syPackingListFabric
 	 * @return
 	 */
-	@AutoLog(value = "装箱单面料-添加")
-	@ApiOperation(value="装箱单面料-添加", notes="装箱单面料-添加")
+	@AutoLog(value = "装箱单-面辅料-添加")
+	@ApiOperation(value="装箱单-面辅料-添加", notes="装箱单-面辅料-添加")
 	@PostMapping(value = "/add")
 	public Result<SyPackingListFabric> add(@RequestBody SyPackingListFabric syPackingListFabric) {
 		Result<SyPackingListFabric> result=new Result<>();
@@ -205,8 +205,8 @@ public class SyPackingListFabricController {
 	  * @param id
 	  * @return
 	  */
-	 @AutoLog(value = "装箱单面料-提交")
-	 @ApiOperation(value="装箱单面料-提交", notes="装箱单面料-提交")
+	 @AutoLog(value = "装箱单-面辅料-提交")
+	 @ApiOperation(value="装箱单-面辅料-提交", notes="装箱单-面辅料-提交")
 	 @GetMapping(value = "/submit")
 	 public Result<SyPackingListFabric> submit(String id) {
 		 Result<SyPackingListFabric> result=new Result<>();
@@ -235,8 +235,8 @@ public class SyPackingListFabricController {
 	  * @param id
 	  * @return
 	  */
-	 @AutoLog(value = "装箱单面料-取消提交")
-	 @ApiOperation(value="装箱单面料-取消提交", notes="装箱单面料-取消提交")
+	 @AutoLog(value = "装箱单-面辅料-取消提交")
+	 @ApiOperation(value="装箱单-面辅料-取消提交", notes="装箱单-面辅料-取消提交")
 	 @GetMapping(value = "/cancelSubmit")
 	 public Result<SyPackingListFabric> cancelSubmit(String id) {
 		 Result<SyPackingListFabric> result=new Result<>();
@@ -265,8 +265,8 @@ public class SyPackingListFabricController {
 	 * @param syPackingListFabric
 	 * @return
 	 */
-	@AutoLog(value = "装箱单面料-编辑")
-	@ApiOperation(value="装箱单面料-编辑", notes="装箱单面料-编辑")
+	@AutoLog(value = "装箱单-面辅料-编辑")
+	@ApiOperation(value="装箱单-面辅料-编辑", notes="装箱单-面辅料-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<?> edit(@RequestBody SyPackingListFabric syPackingListFabric) {
 		Result<SyPackingListFabric> result=new Result<>();
@@ -289,8 +289,8 @@ public class SyPackingListFabricController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "装箱单面料-通过id删除")
-	@ApiOperation(value="装箱单面料-通过id删除", notes="装箱单面料-通过id删除")
+	@AutoLog(value = "装箱单-面辅料-通过id删除")
+	@ApiOperation(value="装箱单-面辅料-通过id删除", notes="装箱单-面辅料-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	    syPackingListFabricService.delMain(id);
@@ -303,8 +303,8 @@ public class SyPackingListFabricController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "装箱单面料-批量删除")
-	@ApiOperation(value="装箱单面料-批量删除", notes="装箱单面料-批量删除")
+	@AutoLog(value = "装箱单-面辅料-批量删除")
+	@ApiOperation(value="装箱单-面辅料-批量删除", notes="装箱单-面辅料-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.syPackingListFabricService.delBatchMain(Arrays.asList(ids.split(",")));
@@ -317,8 +317,8 @@ public class SyPackingListFabricController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "装箱单面料-通过id查询")
-	@ApiOperation(value="装箱单面料-通过id查询", notes="装箱单面料-通过id查询")
+	@AutoLog(value = "装箱单-面辅料-通过id查询")
+	@ApiOperation(value="装箱单-面辅料-通过id查询", notes="装箱单-面辅料-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<SyPackingListFabric> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<SyPackingListFabric> result=new Result<>();

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

@@ -23,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("sy_packing_list_fabric")
-@ApiModel(value="sy_packing_list_fabric对象", description="装箱单面料")
+@ApiModel(value="sy_packing_list_fabric对象", description="装箱单-面辅料")
 public class SyPackingListFabric implements Serializable {
     private static final long serialVersionUID = 1L;
     

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

@@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("sy_packing_list_fabric_item")
-@ApiModel(value="sy_packing_list_fabric对象", description="装箱单面料")
+@ApiModel(value="sy_packing_list_fabric对象", description="装箱单-面辅料")
 public class SyPackingListFabricItem implements Serializable {
     private static final long serialVersionUID = 1L;
     

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

@@ -77,6 +77,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setSalesman(detailsItem.getSalesman());//获取业务员
 			entity.setSalesDepartment(detailsItem.getSalesDepartment());//获取业务部门
 			entity.setPreDeliveryDate(detailsItem.getPreDeliveryDate());//hod
+			entity.setOrderNumber(detailsItem.getOrderNumber());//获取订单号
 			entity.setSmallPo(detailsItem.getSmallPo());//小po
 			entity.setDistributionPoint(detailsItem.getDistributionPoint());//分销点
 			entity.setPurOrSubOrder(detailsItem.getPurOrSubOrder());//采购委外订单号