33 changed files with 3021 additions and 615 deletions
@ -1,489 +0,0 @@ |
|||
{ |
|||
"info": { |
|||
"_postman_id": "584232a7-9ae4-4ca2-b4e5-d9e66870957e", |
|||
"name": "永裕家居LMS系统", |
|||
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" |
|||
}, |
|||
"item": [ |
|||
{ |
|||
"name": "示例", |
|||
"description": "", |
|||
"item": [ |
|||
{ |
|||
"name": "LMS登录", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "56672d9d-9bac-4f23-b77e-809647ef5df4", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
}, |
|||
{ |
|||
"listen": "test", |
|||
"script": { |
|||
"id": "48d9e766-7014-4243-80de-81d63be07da5", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"//postman使用:https://blog.csdn.net/wangyiyan315/article/details/122441791", |
|||
"", |
|||
"var JsonData = JSON.parse(responseBody); //定义一个变量，并且将请求返回的内容赋给该变量", |
|||
"pm.globals.set(\"lms_token\", JsonData.token.slice(7)); //7代表去掉token前面的Bearer加空格", |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"method": "POST", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "{\n\t\n\t\"username\":\"admin\",\n\t\"password\":\"uefvHbyUCADkudW1MV+/yw9XBWR2Z+KDyq+dqQ+ozr1loClUgqm4XQPsUl87IsXetYBWRDLo7HC++20VHlW80g==\"\n}" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/mobile/auth/login", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"mobile", |
|||
"auth", |
|||
"login" |
|||
] |
|||
}, |
|||
"description": "LMS登录并设置返回的token" |
|||
}, |
|||
"response": [] |
|||
}, |
|||
{ |
|||
"name": "系统参数分页查询-示例", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "GET", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "/api/param" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/param?sort=id,desc&size=10&page=0", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"param" |
|||
], |
|||
"query": [ |
|||
{ |
|||
"key": "sort", |
|||
"value": "id,desc" |
|||
}, |
|||
{ |
|||
"key": "size", |
|||
"value": "10" |
|||
}, |
|||
{ |
|||
"key": "page", |
|||
"value": "0" |
|||
}, |
|||
{ |
|||
"key": null, |
|||
"value": null |
|||
}, |
|||
{ |
|||
"key": null, |
|||
"value": null |
|||
} |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
}, |
|||
{ |
|||
"name": "根据编码获取值-示例", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "POST", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "IS_CONNECT_ACS" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/param/getValueByCode", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"param", |
|||
"getValueByCode" |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
}, |
|||
{ |
|||
"name": "删除参数-示例", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "DELETE", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "[\"0c1d96d335cd4dd6aa0a4bee4b1c45fe\"]" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/param", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"param" |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
}, |
|||
{ |
|||
"name": "新增参数-示例", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "POST", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "{\"code\":\"test22\",\"is_active\":\"1\",\"remark\":\"test11\",\"name\":\"test11\",\"value\":\"test11\"}" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/param", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"param" |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
}, |
|||
{ |
|||
"name": "修改参数-示例", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "PUT", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "{\"code\":\"test22\",\"is_active\":\"8\",\"create_time\":\"2022-10-14 13:33:52\",\"remark\":\"888\",\"update_time\":\"2022-10-14 13:33:52\",\"update_optname\":\"管理员\",\"create_id\":1,\"name\":\"888\",\"id\":\"3f1901b5814d40908bad602854b22aa6\",\"value\":\"8888\",\"update_id\":1,\"create_name\":\"管理员\"}" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/param", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"param" |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
} |
|||
] |
|||
}, |
|||
{ |
|||
"name": "ACS请求LMS", |
|||
"description": "", |
|||
"item": [ |
|||
{ |
|||
"name": "共挤线申请空盘", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "POST", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "{\"type\":\"1\",\"point_code\":\"GJX01_K\",\"vehicle_code\":\"001\",\"qty\":\"100\",\"vehicle_type\":\"01\",\"vehicle_num\":\"1\"}" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/wms/task/apply", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"wms", |
|||
"task", |
|||
"apply" |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
}, |
|||
{ |
|||
"name": "油漆线空盘入库", |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "4f07b550-ab9c-41a4-8dbf-f889ae50b246", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"request": { |
|||
"auth": { |
|||
"type": "bearer", |
|||
"bearer": [ |
|||
{ |
|||
"key": "token", |
|||
"value": "{{lms_token}}", |
|||
"type": "string" |
|||
} |
|||
] |
|||
}, |
|||
"method": "POST", |
|||
"header": [ |
|||
{ |
|||
"key": "Content-Type", |
|||
"value": "application/json" |
|||
} |
|||
], |
|||
"body": { |
|||
"mode": "raw", |
|||
"raw": "{\"code\":\"test22\",\"is_active\":\"1\",\"remark\":\"test11\",\"name\":\"test11\",\"value\":\"test11\"}" |
|||
}, |
|||
"url": { |
|||
"raw": "{{lms_url}}/api/param", |
|||
"host": [ |
|||
"{{lms_url}}" |
|||
], |
|||
"path": [ |
|||
"api", |
|||
"param" |
|||
] |
|||
}, |
|||
"description": "求方法参数:{\"whereJson\":{\"sort\":\"id,desc\",\"size\":\"10\",\"page\":\"0\"}}" |
|||
}, |
|||
"response": [] |
|||
} |
|||
] |
|||
} |
|||
], |
|||
"event": [ |
|||
{ |
|||
"listen": "prerequest", |
|||
"script": { |
|||
"id": "32f60779-6a66-4d77-80e3-1bc0040e7650", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
}, |
|||
{ |
|||
"listen": "test", |
|||
"script": { |
|||
"id": "fb339152-4984-49bb-8955-3e24baac67ae", |
|||
"type": "text/javascript", |
|||
"exec": [ |
|||
"" |
|||
] |
|||
} |
|||
} |
|||
], |
|||
"variable": [ |
|||
{ |
|||
"id": "9b318f5e-373b-4f36-93a5-d131f4f76446", |
|||
"key": "lms_url", |
|||
"value": "http://localhost:8010", |
|||
"type": "string", |
|||
"description": "" |
|||
}, |
|||
{ |
|||
"id": "5557e8ff-f6ac-45b0-a950-4a8c139d1ae0", |
|||
"key": "acs_url", |
|||
"value": "http://localhost:8010", |
|||
"type": "string", |
|||
"description": "" |
|||
} |
|||
] |
|||
} |
|||
@ -0,0 +1,188 @@ |
|||
package org.nl.common.annotation.dao; |
|||
import java.io.Serializable; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
import com.baomidou.mybatisplus.annotation.*; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.baomidou.mybatisplus.extension.activerecord.Model; |
|||
|
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} 库存调拨单表(Allocationbill)实体类 |
|||
* {@code @Author:} gbx |
|||
* @since 2024-05-23 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper = true) |
|||
@TableName("allocationbill") |
|||
public class Allocationbill extends Model<Allocationbill> |
|||
{ |
|||
|
|||
private static final long serialVersionUID = -7739291296662381393L; |
|||
//@TableId(value = "id", type = IdType.NONE)
|
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String djbh; |
|||
|
|||
|
|||
/** |
|||
* 调出库存组织编码 |
|||
*/ |
|||
private String dckcbm; |
|||
|
|||
|
|||
/** |
|||
* 调出库存组织名称 |
|||
*/ |
|||
private String dckcmc; |
|||
|
|||
|
|||
/** |
|||
* 调入库存组织编码 |
|||
*/ |
|||
private String drkcbm; |
|||
|
|||
|
|||
/** |
|||
* 调入库存组织名称 |
|||
*/ |
|||
private String drkcmc; |
|||
|
|||
|
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
|
|||
|
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String wlmc; |
|||
|
|||
|
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
|
|||
|
|||
/** |
|||
* 辅助属性 |
|||
*/ |
|||
private String fzsx; |
|||
|
|||
|
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private String jldw; |
|||
|
|||
|
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private String sl; |
|||
|
|||
|
|||
/** |
|||
* 库存类型 |
|||
*/ |
|||
private String kclx; |
|||
|
|||
|
|||
/** |
|||
* 库存状态 |
|||
*/ |
|||
private String kczt; |
|||
|
|||
|
|||
/** |
|||
* 调出仓库编码 |
|||
*/ |
|||
private String dcckbm; |
|||
|
|||
|
|||
/** |
|||
* 调出仓库名称 |
|||
*/ |
|||
private String dcckmc; |
|||
|
|||
|
|||
/** |
|||
* 调出库位编码 |
|||
*/ |
|||
private String dckwbm; |
|||
|
|||
|
|||
/** |
|||
* 调出库位名称 |
|||
*/ |
|||
private String dckwmc; |
|||
|
|||
|
|||
/** |
|||
* 调入仓库编码 |
|||
*/ |
|||
private String drckbm; |
|||
|
|||
|
|||
/** |
|||
* 调入仓库名称 |
|||
*/ |
|||
private String drckmc; |
|||
|
|||
|
|||
/** |
|||
* 调入库位编码 |
|||
*/ |
|||
private String drkwbm; |
|||
|
|||
|
|||
/** |
|||
* 调入库位名称 |
|||
*/ |
|||
private String drkwmc; |
|||
|
|||
|
|||
/** |
|||
* 跟踪号 |
|||
*/ |
|||
private String gzh; |
|||
|
|||
|
|||
/** |
|||
* 计划调入日期 |
|||
*/ |
|||
private String jhdrrq; |
|||
|
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String bz; |
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 获取主键值 |
|||
* |
|||
* @return 主键值 |
|||
*/ |
|||
@Override |
|||
protected Serializable pkVal() |
|||
{ |
|||
return this.djbh; |
|||
} |
|||
|
|||
} |
|||
|
|||
|
|||
|
|||
@ -0,0 +1,118 @@ |
|||
package org.nl.common.annotation.dto; |
|||
|
|||
|
|||
|
|||
import lombok.Data; |
|||
import lombok.*; |
|||
import lombok.EqualsAndHashCode; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
import org.nl.common.annotation.dao.Allocationbill; |
|||
/** |
|||
* {@code @Description:} 库存调拨单表(Allocationbill)查询参数类 |
|||
* {@code @Author:} gbx |
|||
* @since 2024-05-23 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@ToString |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
@EqualsAndHashCode(callSuper = false) |
|||
public class AllocationbillVO extends BaseQuery<Allocationbill> { |
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String djbh; |
|||
/** |
|||
* 调出库存组织编码 |
|||
*/ |
|||
private String dckcbm; |
|||
/** |
|||
* 调出库存组织名称 |
|||
*/ |
|||
private String dckcmc; |
|||
/** |
|||
* 调入库存组织编码 |
|||
*/ |
|||
private String drkcbm; |
|||
/** |
|||
* 调入库存组织名称 |
|||
*/ |
|||
private String drkcmc; |
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String wlmc; |
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
/** |
|||
* 辅助属性 |
|||
*/ |
|||
private String fzsx; |
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private String jldw; |
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private String sl; |
|||
/** |
|||
* 库存类型 |
|||
*/ |
|||
private String kclx; |
|||
/** |
|||
* 库存状态 |
|||
*/ |
|||
private String kczt; |
|||
/** |
|||
* 调出仓库编码 |
|||
*/ |
|||
private String dcckbm; |
|||
/** |
|||
* 调出仓库名称 |
|||
*/ |
|||
private String dcckmc; |
|||
/** |
|||
* 调出库位编码 |
|||
*/ |
|||
private String dckwbm; |
|||
/** |
|||
* 调出库位名称 |
|||
*/ |
|||
private String dckwmc; |
|||
/** |
|||
* 调入仓库编码 |
|||
*/ |
|||
private String drckbm; |
|||
/** |
|||
* 调入仓库名称 |
|||
*/ |
|||
private String drckmc; |
|||
/** |
|||
* 调入库位编码 |
|||
*/ |
|||
private String drkwbm; |
|||
/** |
|||
* 调入库位名称 |
|||
*/ |
|||
private String drkwmc; |
|||
/** |
|||
* 跟踪号 |
|||
*/ |
|||
private String gzh; |
|||
/** |
|||
* 计划调入日期 |
|||
*/ |
|||
private String jhdrrq; |
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String bz; |
|||
} |
|||
@ -0,0 +1,122 @@ |
|||
package org.nl.wms.database.eas.controller; |
|||
|
|||
import java.util.List; |
|||
import java.util.Set; |
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import org.nl.common.base.CommonPage; |
|||
import org.nl.common.base.CommonResult; |
|||
import org.nl.common.base.RestBusinessTemplate; |
|||
import org.nl.common.base.ResultCode; |
|||
import org.nl.wms.database.eas.dao.AllocationBill; |
|||
import org.springframework.web.bind.annotation.*; |
|||
import lombok.RequiredArgsConstructor; |
|||
|
|||
import javax.annotation.Resource; |
|||
|
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.database.eas.dto.AllocationBillVO; |
|||
import org.nl.wms.database.eas.service.IallocationBillService; |
|||
|
|||
|
|||
/** |
|||
* (AllocationBill)控制层 |
|||
*/ |
|||
@RestController |
|||
@RequiredArgsConstructor |
|||
@RequestMapping("/api/allocationBill") |
|||
@Slf4j |
|||
public class AllocationBillController { |
|||
|
|||
|
|||
@Resource |
|||
private IallocationBillService allocationBillService; |
|||
|
|||
|
|||
/** |
|||
* 分页查询 |
|||
* |
|||
* @param params 传入分页条件或查询条件，例：{"page":"0","size":"10", "fuzzy":"熊一" } |
|||
*/ |
|||
@PostMapping("/page") |
|||
@Log("分页查询") |
|||
public ResponseEntity<CommonPage<AllocationBill>> page(@RequestBody AllocationBillVO params) { |
|||
return new ResponseEntity<>(allocationBillService.page(params), HttpStatus.OK); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 条件查询 |
|||
* |
|||
* @param params 传入查询条件，例：{"fuzzy":"熊一" } |
|||
*/ |
|||
@PostMapping("/query") |
|||
@Log("条件查询") |
|||
public CommonResult<List<AllocationBill>> query(@RequestBody AllocationBillVO params) { |
|||
return RestBusinessTemplate.execute(() -> allocationBillService.query(params)); |
|||
} |
|||
|
|||
/** |
|||
* 单据直接调拨 |
|||
* |
|||
* @param ids 传入审核对象主键，例：{"id":"1"} |
|||
* @return 单据直接调拨 |
|||
*/ |
|||
@PostMapping("/allocationConfirm") |
|||
@Log("单据直接调拨") |
|||
@SaIgnore |
|||
//@SaCheckPermission("@el.check(allocationConfirm:edit')")
|
|||
public CommonResult allocationConfirm(@RequestBody List<String> ids) { |
|||
if (ids == null || ids.isEmpty()) { |
|||
return CommonResult.failed(ResultCode.FAILED); |
|||
} |
|||
return RestBusinessTemplate.execute(() -> allocationBillService.allocationConfirm(ids)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 新增数据 |
|||
* |
|||
* @param entity 传入新增对象，例：{"name":"熊大", "age":"16" } |
|||
* @return 新增结果 |
|||
*/ |
|||
@PostMapping("/create") |
|||
@Log("新增") |
|||
public CommonResult create(@RequestBody AllocationBillVO entity) { |
|||
return RestBusinessTemplate.execute(() -> allocationBillService.create(entity)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 修改数据 |
|||
* |
|||
* @param entity 传入修改对象包含主键，例：{"id":"1", "name":"熊二" } |
|||
* @return 修改结果 |
|||
*/ |
|||
@PostMapping("/update") |
|||
@Log("修改") |
|||
//@SaCheckPermission("@el.check(AllocationBill:edit')")
|
|||
public CommonResult update(@RequestBody AllocationBillVO entity) { |
|||
return RestBusinessTemplate.execute(() -> allocationBillService.update(entity)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 删除数据 |
|||
* |
|||
* @param ids 传入单个或多个主键Id，例：["1","2"] |
|||
* @return 删除结果 |
|||
*/ |
|||
@Log("删除") |
|||
//@SaCheckPermission("@el.check(AllocationBill:del')")
|
|||
@PostMapping("/delete") |
|||
public CommonResult delete(@RequestBody Set<String> ids) { |
|||
return RestBusinessTemplate.execute(() -> allocationBillService.delete(ids)); |
|||
} |
|||
|
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,122 @@ |
|||
package org.nl.wms.database.eas.controller; |
|||
|
|||
import java.util.List; |
|||
import java.util.Set; |
|||
|
|||
import cn.dev33.satoken.annotation.SaIgnore; |
|||
import org.nl.common.base.CommonPage; |
|||
import org.nl.common.base.CommonResult; |
|||
import org.nl.common.base.RestBusinessTemplate; |
|||
import org.nl.common.base.ResultCode; |
|||
import org.nl.wms.database.eas.dao.ReceiptBill; |
|||
import org.springframework.web.bind.annotation.*; |
|||
import lombok.RequiredArgsConstructor; |
|||
|
|||
import javax.annotation.Resource; |
|||
|
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.database.eas.dto.ReceiptBillVO; |
|||
import org.nl.wms.database.eas.service.IreceiptBillService; |
|||
|
|||
|
|||
/** |
|||
* (ReceiptBill)控制层 |
|||
*/ |
|||
@RestController |
|||
@RequiredArgsConstructor |
|||
@RequestMapping("/api/receiptBill") |
|||
@Slf4j |
|||
public class ReceiptBillController { |
|||
|
|||
|
|||
@Resource |
|||
private IreceiptBillService receiptBillService; |
|||
|
|||
|
|||
/** |
|||
* 分页查询 |
|||
* |
|||
* @param params 传入分页条件或查询条件，例：{"page":"0","size":"10", "fuzzy":"熊一" } |
|||
*/ |
|||
@PostMapping("/page") |
|||
@Log("分页查询") |
|||
public ResponseEntity<CommonPage<ReceiptBill>> page(@RequestBody ReceiptBillVO params) { |
|||
return new ResponseEntity<>(receiptBillService.page(params), HttpStatus.OK); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 条件查询 |
|||
* |
|||
* @param params 传入查询条件，例：{"fuzzy":"熊一" } |
|||
*/ |
|||
@PostMapping("/query") |
|||
@Log("条件查询") |
|||
public CommonResult<List<ReceiptBill>> query(@RequestBody ReceiptBillVO params) { |
|||
return RestBusinessTemplate.execute(() -> receiptBillService.query(params)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 收货单确认 |
|||
* |
|||
* @param ids 传入审核对象主键，例：{"id":"1"} |
|||
* @return 收货单确认 |
|||
*/ |
|||
@PostMapping("/receiptConfirm") |
|||
@Log("收货单确认") |
|||
@SaIgnore |
|||
//@SaCheckPermission("@el.check(receiptConfirm:edit')")
|
|||
public CommonResult receiptConfirm(@RequestBody List<String> ids) { |
|||
if (ids == null || ids.isEmpty()) { |
|||
return CommonResult.failed(ResultCode.FAILED); |
|||
} |
|||
return RestBusinessTemplate.execute(() -> receiptBillService.receiptConfirm(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 新增数据 |
|||
* |
|||
* @param entity 传入新增对象，例：{"name":"熊大", "age":"16" } |
|||
* @return 新增结果 |
|||
*/ |
|||
@PostMapping("/create") |
|||
@Log("新增") |
|||
public CommonResult create(@RequestBody ReceiptBillVO entity) { |
|||
return RestBusinessTemplate.execute(() -> receiptBillService.create(entity)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 修改数据 |
|||
* |
|||
* @param entity 传入修改对象包含主键，例：{"id":"1", "name":"熊二" } |
|||
* @return 修改结果 |
|||
*/ |
|||
@PostMapping("/update") |
|||
@Log("修改") |
|||
//@SaCheckPermission("@el.check(ReceiptBill:edit')")
|
|||
public CommonResult update(@RequestBody ReceiptBillVO entity) { |
|||
return RestBusinessTemplate.execute(() -> receiptBillService.update(entity)); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 删除数据 |
|||
* |
|||
* @param ids 传入单个或多个主键Id，例：["1","2"] |
|||
* @return 删除结果 |
|||
*/ |
|||
@Log("删除") |
|||
//@SaCheckPermission("@el.check(ReceiptBill:del')")
|
|||
@PostMapping("/delete") |
|||
public CommonResult delete(@RequestBody Set<String> ids) { |
|||
return RestBusinessTemplate.execute(() -> receiptBillService.delete(ids)); |
|||
} |
|||
|
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,274 @@ |
|||
package org.nl.wms.database.eas.dao; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
import com.baomidou.mybatisplus.annotation.*; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.baomidou.mybatisplus.extension.activerecord.Model; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} (AllocationBill)实体类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper = true) |
|||
@TableName("allocation_bill") |
|||
public class AllocationBill extends Model<AllocationBill> { |
|||
|
|||
private static final long serialVersionUID = -7739291296662381393L; |
|||
//@TableId(value = "id", type = IdType.NONE)
|
|||
|
|||
|
|||
/** |
|||
* 单据ID |
|||
*/ |
|||
private String djid; |
|||
|
|||
|
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String djbh; |
|||
|
|||
|
|||
/** |
|||
* 业务类型 |
|||
*/ |
|||
private String ywlx; |
|||
|
|||
|
|||
/** |
|||
* 业务日期 |
|||
*/ |
|||
private String ywrq; |
|||
|
|||
|
|||
/** |
|||
* 调出库存组织编码 |
|||
*/ |
|||
private String dckcbm; |
|||
|
|||
|
|||
/** |
|||
* 调出库存组织名称 |
|||
*/ |
|||
private String dckcmc; |
|||
|
|||
|
|||
/** |
|||
* 调入库存组织编码 |
|||
*/ |
|||
private String drkcbm; |
|||
|
|||
|
|||
/** |
|||
* 调入库存组织名称 |
|||
*/ |
|||
private String drkcmc; |
|||
|
|||
|
|||
/** |
|||
* 调出部门 |
|||
*/ |
|||
private String dcbm; |
|||
|
|||
|
|||
/** |
|||
* 调入部门 |
|||
*/ |
|||
private String drbm; |
|||
|
|||
|
|||
/** |
|||
* 表头备注 |
|||
*/ |
|||
private String btbz; |
|||
|
|||
|
|||
/** |
|||
* 制单时间 |
|||
*/ |
|||
private String cjsj; |
|||
|
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String cjr; |
|||
|
|||
|
|||
/** |
|||
* 单据状态 |
|||
*/ |
|||
private String djzt; |
|||
|
|||
|
|||
/** |
|||
* 分录ID |
|||
*/ |
|||
private String flid; |
|||
|
|||
|
|||
/** |
|||
* 分录序号 |
|||
*/ |
|||
private String flxh; |
|||
|
|||
|
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
|
|||
|
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String wlmc; |
|||
|
|||
|
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
|
|||
|
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
|
|||
|
|||
/** |
|||
* 辅助属性 |
|||
*/ |
|||
private String fzsx; |
|||
|
|||
|
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private String jldw; |
|||
|
|||
|
|||
/** |
|||
* 基本计量单位 |
|||
*/ |
|||
private String jbjldw; |
|||
|
|||
|
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private String sl; |
|||
|
|||
|
|||
/** |
|||
* 基本数量 |
|||
*/ |
|||
private String jbsl; |
|||
|
|||
|
|||
/** |
|||
* 库存类型 |
|||
*/ |
|||
private String kclx; |
|||
|
|||
|
|||
/** |
|||
* 库存状态 |
|||
*/ |
|||
private String kczt; |
|||
|
|||
|
|||
/** |
|||
* 调出仓库编码 |
|||
*/ |
|||
private String dcckbm; |
|||
|
|||
|
|||
/** |
|||
* 调出仓库名称 |
|||
*/ |
|||
private String dcckmc; |
|||
|
|||
|
|||
/** |
|||
* 调出库位编码 |
|||
*/ |
|||
private String dckwbm; |
|||
|
|||
|
|||
/** |
|||
* 调出库位名称 |
|||
*/ |
|||
private String dckwmc; |
|||
|
|||
|
|||
/** |
|||
* 调入仓库编码 |
|||
*/ |
|||
private String drckbm; |
|||
|
|||
|
|||
/** |
|||
* 调入仓库名称 |
|||
*/ |
|||
private String drckmc; |
|||
|
|||
|
|||
/** |
|||
* 调入库位编码 |
|||
*/ |
|||
private String drkwbm; |
|||
|
|||
|
|||
/** |
|||
* 调入库位名称 |
|||
*/ |
|||
private String drkwmc; |
|||
|
|||
|
|||
/** |
|||
* 跟踪号 |
|||
*/ |
|||
private String gzh; |
|||
|
|||
|
|||
/** |
|||
* 计划调入日期 |
|||
*/ |
|||
private String jhdrrq; |
|||
|
|||
|
|||
/** |
|||
* 计划调出日期 |
|||
*/ |
|||
private String jhdcrq; |
|||
|
|||
|
|||
/** |
|||
* 分录备注 |
|||
*/ |
|||
private String flbz; |
|||
|
|||
|
|||
/** |
|||
* 获取主键值 |
|||
* |
|||
* @return 主键值 |
|||
*/ |
|||
@Override |
|||
protected Serializable pkVal() { |
|||
return this.djid; |
|||
} |
|||
|
|||
} |
|||
|
|||
|
|||
|
|||
@ -0,0 +1,226 @@ |
|||
package org.nl.wms.database.eas.dao; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
import com.baomidou.mybatisplus.annotation.*; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.baomidou.mybatisplus.extension.activerecord.Model; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} (ReceiptBill)实体类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper = true) |
|||
@TableName("receipt_bill") |
|||
public class ReceiptBill extends Model<ReceiptBill> { |
|||
|
|||
private static final long serialVersionUID = -7739291296662381393L; |
|||
//@TableId(value = "id", type = IdType.NONE)
|
|||
|
|||
|
|||
/** |
|||
* 送货单号 |
|||
*/ |
|||
private String djbh; |
|||
|
|||
|
|||
/** |
|||
* 送贷日期 |
|||
*/ |
|||
private String ywrq; |
|||
|
|||
|
|||
/** |
|||
* 提交时间 |
|||
*/ |
|||
private String tjsj; |
|||
|
|||
|
|||
/** |
|||
* 采购订单号 |
|||
*/ |
|||
private String cgbh; |
|||
|
|||
|
|||
/** |
|||
* 采购公司 |
|||
*/ |
|||
private String cggs; |
|||
|
|||
|
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
|
|||
|
|||
/** |
|||
* 物科名称 |
|||
*/ |
|||
private String wlmc; |
|||
|
|||
|
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
|
|||
|
|||
/** |
|||
* 单位 |
|||
*/ |
|||
private String jldw; |
|||
|
|||
|
|||
/** |
|||
* 订单量 |
|||
*/ |
|||
private String ddsl; |
|||
|
|||
|
|||
/** |
|||
* 本次送货数量 |
|||
*/ |
|||
private String bcshsl; |
|||
|
|||
|
|||
/** |
|||
* 收货数量 |
|||
*/ |
|||
private String shsl; |
|||
|
|||
|
|||
/** |
|||
* 件数 |
|||
*/ |
|||
private String num; |
|||
|
|||
|
|||
/** |
|||
* 收货组织 |
|||
*/ |
|||
private String zzbm; |
|||
|
|||
|
|||
/** |
|||
* 收货仓库 |
|||
*/ |
|||
private String zzmc; |
|||
|
|||
|
|||
/** |
|||
* 收货库位 |
|||
*/ |
|||
private String shcw; |
|||
|
|||
|
|||
/** |
|||
* 是否质检 |
|||
*/ |
|||
private String sfzj; |
|||
|
|||
|
|||
/** |
|||
* 批次管理 |
|||
*/ |
|||
private String pcgl; |
|||
|
|||
|
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
|
|||
|
|||
/** |
|||
* 所属厂区 |
|||
*/ |
|||
private String sscq; |
|||
|
|||
|
|||
/** |
|||
* 供应商编码 |
|||
*/ |
|||
private String gysbm; |
|||
|
|||
|
|||
/** |
|||
* 供应商 |
|||
*/ |
|||
private String gys; |
|||
|
|||
|
|||
/** |
|||
* 到货日期 |
|||
*/ |
|||
private String dhrq; |
|||
|
|||
|
|||
/** |
|||
* 创建入编码 |
|||
*/ |
|||
private String cjr; |
|||
|
|||
|
|||
/** |
|||
* 创建日期 |
|||
*/ |
|||
private String cjrq; |
|||
|
|||
|
|||
/** |
|||
* 采购员 |
|||
*/ |
|||
private String cgy; |
|||
|
|||
|
|||
/** |
|||
* 送货人 |
|||
*/ |
|||
private String shy; |
|||
|
|||
|
|||
/** |
|||
* 收货人 |
|||
*/ |
|||
private String shr; |
|||
|
|||
|
|||
/** |
|||
* 预计到货日期 |
|||
*/ |
|||
private String yjdhrq; |
|||
|
|||
|
|||
/** |
|||
* 收货地址 |
|||
*/ |
|||
private String shdz; |
|||
|
|||
|
|||
/** |
|||
* 包装类别 |
|||
*/ |
|||
private String bzlb; |
|||
|
|||
|
|||
/** |
|||
* 获取主键值 |
|||
* |
|||
* @return 主键值 |
|||
*/ |
|||
@Override |
|||
protected Serializable pkVal() { |
|||
return this.djbh; |
|||
} |
|||
|
|||
} |
|||
|
|||
|
|||
|
|||
@ -0,0 +1,52 @@ |
|||
package org.nl.wms.database.eas.dao; |
|||
|
|||
import lombok.Data; |
|||
import lombok.ToString; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 仓库信息 |
|||
* |
|||
* @author gbx |
|||
* @since 2024-05-22 |
|||
*/ |
|||
@Data |
|||
@ToString |
|||
public class WarehouseInfo implements Serializable { |
|||
|
|||
/** |
|||
* 仓库编码 |
|||
*/ |
|||
private String ckbm; |
|||
|
|||
/** |
|||
* 仓库名称 |
|||
*/ |
|||
private String ckmc; |
|||
|
|||
/** |
|||
* 组织编码 |
|||
*/ |
|||
private String kcbm; |
|||
|
|||
|
|||
/** |
|||
* 组织名称 |
|||
*/ |
|||
private String kcmc; |
|||
|
|||
/** |
|||
* 状态 |
|||
*/ |
|||
private String zt; |
|||
|
|||
|
|||
/** |
|||
* 是否对接WMS |
|||
*/ |
|||
private String iswms; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package org.nl.wms.database.eas.dao.mapper; |
|||
|
|||
import com.baomidou.dynamic.datasource.annotation.DS; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import io.lettuce.core.dynamic.annotation.Param; |
|||
import org.apache.ibatis.annotations.Select; |
|||
import org.nl.wms.database.eas.dao.AllocationBill; |
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
|
|||
/** |
|||
* {@code @Description:} (AllocationBill)数据持久层 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
public interface AllocationBillMapper extends BaseMapper<AllocationBill> { |
|||
|
|||
@Select("SELECT COUNT(*) FROM EAS_NOBLE.receiptBill WHERE DJBH = #{djbh}") |
|||
@DS("oracle_eas") |
|||
Long getTotalCount(@Param("djbh") String djbh); |
|||
|
|||
Page<AllocationBill> allocationDetailPage(Page<AllocationBill> page, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy); |
|||
|
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package org.nl.wms.database.eas.dao.mapper; |
|||
|
|||
import com.baomidou.dynamic.datasource.annotation.DS; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import io.lettuce.core.dynamic.annotation.Param; |
|||
import org.nl.wms.database.eas.dao.ReceiptBill; |
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
|
|||
/** |
|||
* {@code @Description:} (ReceiptBill)数据持久层 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
public interface ReceiptBillMapper extends BaseMapper<ReceiptBill> { |
|||
|
|||
@DS("mysql_srm") |
|||
Page<ReceiptBill> receiptDetailPage(Page<ReceiptBill> page, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy); |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="org.nl.wms.database.eas.dao.mapper.AllocationBillMapper"> |
|||
<select id="allocationDetailPage" resultType="org.nl.wms.database.eas.dao.AllocationBill"> |
|||
SELECT * |
|||
FROM EAS_NOBLE.allocation |
|||
WHERE DJBH = #{djbh} |
|||
<!-- <if test="fuzzy != null and fuzzy != ''">--> |
|||
<!-- AND (--> |
|||
<!-- djbh LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR wlmc LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR ggxh LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR fzsl LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR jldw LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR sl LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR kclx LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR kczt LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR dcck LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR dccw LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR drck LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR drcw LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR trackno LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR ywrq LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR bz LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- )--> |
|||
<!-- </if>--> |
|||
ORDER BY djbh ASC |
|||
</select> |
|||
</mapper> |
|||
@ -0,0 +1,29 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="org.nl.wms.database.eas.dao.mapper.ReceiptBillMapper"> |
|||
<select id="receiptDetailPage" resultType="org.nl.wms.database.eas.dao.ReceiptBill"> |
|||
SELECT * |
|||
FROM EAS_NOBLE.receiptBill |
|||
WHERE DJBH = #{djbh} |
|||
<!-- <if test="fuzzy != null and fuzzy != ''">--> |
|||
<!-- AND (--> |
|||
<!-- djbh LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR wlmc LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR ggxh LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR fzsl LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR jldw LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR sl LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR kclx LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR kczt LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR dcck LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR dccw LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR drck LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR drcw LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR trackno LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR ywrq LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- OR bz LIKE CONCAT('%', #{fuzzy}, '%')--> |
|||
<!-- )--> |
|||
<!-- </if>--> |
|||
ORDER BY djbh ASC |
|||
</select> |
|||
</mapper> |
|||
@ -0,0 +1,185 @@ |
|||
package org.nl.wms.database.eas.dto; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
import lombok.*; |
|||
import lombok.Data; |
|||
import lombok.Builder; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} (AllocationBill)数据传输类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
public class AllocationBillDto implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -7739291296662381396L; |
|||
|
|||
|
|||
/** |
|||
* 单据ID |
|||
*/ |
|||
private String djid; |
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String djbh; |
|||
/** |
|||
* 业务类型 |
|||
*/ |
|||
private String ywlx; |
|||
/** |
|||
* 业务日期 |
|||
*/ |
|||
private String ywrq; |
|||
/** |
|||
* 调出库存组织编码 |
|||
*/ |
|||
private String dckcbm; |
|||
/** |
|||
* 调出库存组织名称 |
|||
*/ |
|||
private String dckcmc; |
|||
/** |
|||
* 调入库存组织编码 |
|||
*/ |
|||
private String drkcbm; |
|||
/** |
|||
* 调入库存组织名称 |
|||
*/ |
|||
private String drkcmc; |
|||
/** |
|||
* 调出部门 |
|||
*/ |
|||
private String dcbm; |
|||
/** |
|||
* 调入部门 |
|||
*/ |
|||
private String drbm; |
|||
/** |
|||
* 表头备注 |
|||
*/ |
|||
private String btbz; |
|||
/** |
|||
* 制单时间 |
|||
*/ |
|||
private String cjsj; |
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String cjr; |
|||
/** |
|||
* 单据状态 |
|||
*/ |
|||
private String djzt; |
|||
/** |
|||
* 分录ID |
|||
*/ |
|||
private String flid; |
|||
/** |
|||
* 分录序号 |
|||
*/ |
|||
private String flxh; |
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String wlmc; |
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
/** |
|||
* 辅助属性 |
|||
*/ |
|||
private String fzsx; |
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private String jldw; |
|||
/** |
|||
* 基本计量单位 |
|||
*/ |
|||
private String jbjldw; |
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private String sl; |
|||
/** |
|||
* 基本数量 |
|||
*/ |
|||
private String jbsl; |
|||
/** |
|||
* 库存类型 |
|||
*/ |
|||
private String kclx; |
|||
/** |
|||
* 库存状态 |
|||
*/ |
|||
private String kczt; |
|||
/** |
|||
* 调出仓库编码 |
|||
*/ |
|||
private String dcckbm; |
|||
/** |
|||
* 调出仓库名称 |
|||
*/ |
|||
private String dcckmc; |
|||
/** |
|||
* 调出库位编码 |
|||
*/ |
|||
private String dckwbm; |
|||
/** |
|||
* 调出库位名称 |
|||
*/ |
|||
private String dckwmc; |
|||
/** |
|||
* 调入仓库编码 |
|||
*/ |
|||
private String drckbm; |
|||
/** |
|||
* 调入仓库名称 |
|||
*/ |
|||
private String drckmc; |
|||
/** |
|||
* 调入库位编码 |
|||
*/ |
|||
private String drkwbm; |
|||
/** |
|||
* 调入库位名称 |
|||
*/ |
|||
private String drkwmc; |
|||
/** |
|||
* 跟踪号 |
|||
*/ |
|||
private String gzh; |
|||
/** |
|||
* 计划调入日期 |
|||
*/ |
|||
private String jhdrrq; |
|||
/** |
|||
* 计划调出日期 |
|||
*/ |
|||
private String jhdcrq; |
|||
/** |
|||
* 分录备注 |
|||
*/ |
|||
private String flbz; |
|||
|
|||
} |
|||
|
|||
|
|||
|
|||
@ -0,0 +1,179 @@ |
|||
package org.nl.wms.database.eas.dto; |
|||
import lombok.*; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
|
|||
/** |
|||
* {@code @Description:} 送货单表(allocationBill)查询参数类 |
|||
* {@code @Author:} gbx |
|||
* @since 2024-02-21 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
@EqualsAndHashCode(callSuper = true) |
|||
public class AllocationBillQuery extends BaseQuery<AllocationBillQuery> { |
|||
|
|||
|
|||
|
|||
/** |
|||
* 单据ID |
|||
*/ |
|||
private String djid; |
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String djbh; |
|||
/** |
|||
* 业务类型 |
|||
*/ |
|||
private String ywlx; |
|||
/** |
|||
* 业务日期 |
|||
*/ |
|||
private String ywrq; |
|||
/** |
|||
* 调出库存组织编码 |
|||
*/ |
|||
private String dckcbm; |
|||
/** |
|||
* 调出库存组织名称 |
|||
*/ |
|||
private String dckcmc; |
|||
/** |
|||
* 调入库存组织编码 |
|||
*/ |
|||
private String drkcbm; |
|||
/** |
|||
* 调入库存组织名称 |
|||
*/ |
|||
private String drkcmc; |
|||
/** |
|||
* 调出部门 |
|||
*/ |
|||
private String dcbm; |
|||
/** |
|||
* 调入部门 |
|||
*/ |
|||
private String drbm; |
|||
/** |
|||
* 表头备注 |
|||
*/ |
|||
private String btbz; |
|||
/** |
|||
* 制单时间 |
|||
*/ |
|||
private String cjsj; |
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String cjr; |
|||
/** |
|||
* 单据状态 |
|||
*/ |
|||
private String djzt; |
|||
/** |
|||
* 分录ID |
|||
*/ |
|||
private String flid; |
|||
/** |
|||
* 分录序号 |
|||
*/ |
|||
private String flxh; |
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String wlmc; |
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
/** |
|||
* 辅助属性 |
|||
*/ |
|||
private String fzsx; |
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private String jldw; |
|||
/** |
|||
* 基本计量单位 |
|||
*/ |
|||
private String jbjldw; |
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private String sl; |
|||
/** |
|||
* 基本数量 |
|||
*/ |
|||
private String jbsl; |
|||
/** |
|||
* 库存类型 |
|||
*/ |
|||
private String kclx; |
|||
/** |
|||
* 库存状态 |
|||
*/ |
|||
private String kczt; |
|||
/** |
|||
* 调出仓库编码 |
|||
*/ |
|||
private String dcckbm; |
|||
/** |
|||
* 调出仓库名称 |
|||
*/ |
|||
private String dcckmc; |
|||
/** |
|||
* 调出库位编码 |
|||
*/ |
|||
private String dckwbm; |
|||
/** |
|||
* 调出库位名称 |
|||
*/ |
|||
private String dckwmc; |
|||
/** |
|||
* 调入仓库编码 |
|||
*/ |
|||
private String drckbm; |
|||
/** |
|||
* 调入仓库名称 |
|||
*/ |
|||
private String drckmc; |
|||
/** |
|||
* 调入库位编码 |
|||
*/ |
|||
private String drkwbm; |
|||
/** |
|||
* 调入库位名称 |
|||
*/ |
|||
private String drkwmc; |
|||
/** |
|||
* 跟踪号 |
|||
*/ |
|||
private String gzh; |
|||
/** |
|||
* 计划调入日期 |
|||
*/ |
|||
private String jhdrrq; |
|||
/** |
|||
* 计划调出日期 |
|||
*/ |
|||
private String jhdcrq; |
|||
/** |
|||
* 分录备注 |
|||
*/ |
|||
private String flbz; |
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,179 @@ |
|||
package org.nl.wms.database.eas.dto; |
|||
|
|||
|
|||
import lombok.Data; |
|||
import lombok.*; |
|||
import lombok.EqualsAndHashCode; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
import org.nl.wms.database.eas.dao.AllocationBill; |
|||
|
|||
/** |
|||
* {@code @Description:} (AllocationBill)查询参数类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@ToString |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
@EqualsAndHashCode(callSuper = false) |
|||
public class AllocationBillVO extends BaseQuery<AllocationBill> { |
|||
/** |
|||
* 单据ID |
|||
*/ |
|||
private String djid; |
|||
/** |
|||
* 单据编号 |
|||
*/ |
|||
private String djbh; |
|||
/** |
|||
* 业务类型 |
|||
*/ |
|||
private String ywlx; |
|||
/** |
|||
* 业务日期 |
|||
*/ |
|||
private String ywrq; |
|||
/** |
|||
* 调出库存组织编码 |
|||
*/ |
|||
private String dckcbm; |
|||
/** |
|||
* 调出库存组织名称 |
|||
*/ |
|||
private String dckcmc; |
|||
/** |
|||
* 调入库存组织编码 |
|||
*/ |
|||
private String drkcbm; |
|||
/** |
|||
* 调入库存组织名称 |
|||
*/ |
|||
private String drkcmc; |
|||
/** |
|||
* 调出部门 |
|||
*/ |
|||
private String dcbm; |
|||
/** |
|||
* 调入部门 |
|||
*/ |
|||
private String drbm; |
|||
/** |
|||
* 表头备注 |
|||
*/ |
|||
private String btbz; |
|||
/** |
|||
* 制单时间 |
|||
*/ |
|||
private String cjsj; |
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String cjr; |
|||
/** |
|||
* 单据状态 |
|||
*/ |
|||
private String djzt; |
|||
/** |
|||
* 分录ID |
|||
*/ |
|||
private String flid; |
|||
/** |
|||
* 分录序号 |
|||
*/ |
|||
private String flxh; |
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
/** |
|||
* 物料名称 |
|||
*/ |
|||
private String wlmc; |
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
/** |
|||
* 辅助属性 |
|||
*/ |
|||
private String fzsx; |
|||
/** |
|||
* 计量单位 |
|||
*/ |
|||
private String jldw; |
|||
/** |
|||
* 基本计量单位 |
|||
*/ |
|||
private String jbjldw; |
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private String sl; |
|||
/** |
|||
* 基本数量 |
|||
*/ |
|||
private String jbsl; |
|||
/** |
|||
* 库存类型 |
|||
*/ |
|||
private String kclx; |
|||
/** |
|||
* 库存状态 |
|||
*/ |
|||
private String kczt; |
|||
/** |
|||
* 调出仓库编码 |
|||
*/ |
|||
private String dcckbm; |
|||
/** |
|||
* 调出仓库名称 |
|||
*/ |
|||
private String dcckmc; |
|||
/** |
|||
* 调出库位编码 |
|||
*/ |
|||
private String dckwbm; |
|||
/** |
|||
* 调出库位名称 |
|||
*/ |
|||
private String dckwmc; |
|||
/** |
|||
* 调入仓库编码 |
|||
*/ |
|||
private String drckbm; |
|||
/** |
|||
* 调入仓库名称 |
|||
*/ |
|||
private String drckmc; |
|||
/** |
|||
* 调入库位编码 |
|||
*/ |
|||
private String drkwbm; |
|||
/** |
|||
* 调入库位名称 |
|||
*/ |
|||
private String drkwmc; |
|||
/** |
|||
* 跟踪号 |
|||
*/ |
|||
private String gzh; |
|||
/** |
|||
* 计划调入日期 |
|||
*/ |
|||
private String jhdrrq; |
|||
/** |
|||
* 计划调出日期 |
|||
*/ |
|||
private String jhdcrq; |
|||
/** |
|||
* 分录备注 |
|||
*/ |
|||
private String flbz; |
|||
} |
|||
@ -0,0 +1,153 @@ |
|||
package org.nl.wms.database.eas.dto; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
import lombok.*; |
|||
import lombok.Data; |
|||
import lombok.Builder; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} (ReceiptBill)数据传输类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
public class ReceiptBillDto implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -7739291296662381396L; |
|||
|
|||
|
|||
/** |
|||
* 送货单号 |
|||
*/ |
|||
private String djbh; |
|||
/** |
|||
* 送贷日期 |
|||
*/ |
|||
private String ywrq; |
|||
/** |
|||
* 提交时间 |
|||
*/ |
|||
private String tjsj; |
|||
/** |
|||
* 采购订单号 |
|||
*/ |
|||
private String cgbh; |
|||
/** |
|||
* 采购公司 |
|||
*/ |
|||
private String cggs; |
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
/** |
|||
* 物科名称 |
|||
*/ |
|||
private String wlmc; |
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
/** |
|||
* 单位 |
|||
*/ |
|||
private String jldw; |
|||
/** |
|||
* 订单量 |
|||
*/ |
|||
private String ddsl; |
|||
/** |
|||
* 本次送货数量 |
|||
*/ |
|||
private String bcshsl; |
|||
/** |
|||
* 收货数量 |
|||
*/ |
|||
private String shsl; |
|||
/** |
|||
* 件数 |
|||
*/ |
|||
private String num; |
|||
/** |
|||
* 收货组织 |
|||
*/ |
|||
private String zzbm; |
|||
/** |
|||
* 收货仓库 |
|||
*/ |
|||
private String zzmc; |
|||
/** |
|||
* 收货库位 |
|||
*/ |
|||
private String shcw; |
|||
/** |
|||
* 是否质检 |
|||
*/ |
|||
private String sfzj; |
|||
/** |
|||
* 批次管理 |
|||
*/ |
|||
private String pcgl; |
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
/** |
|||
* 所属厂区 |
|||
*/ |
|||
private String sscq; |
|||
/** |
|||
* 供应商编码 |
|||
*/ |
|||
private String gysbm; |
|||
/** |
|||
* 供应商 |
|||
*/ |
|||
private String gys; |
|||
/** |
|||
* 到货日期 |
|||
*/ |
|||
private String dhrq; |
|||
/** |
|||
* 创建入编码 |
|||
*/ |
|||
private String cjr; |
|||
/** |
|||
* 创建日期 |
|||
*/ |
|||
private String cjrq; |
|||
/** |
|||
* 采购员 |
|||
*/ |
|||
private String cgy; |
|||
/** |
|||
* 送货人 |
|||
*/ |
|||
private String shy; |
|||
/** |
|||
* 收货人 |
|||
*/ |
|||
private String shr; |
|||
/** |
|||
* 预计到货日期 |
|||
*/ |
|||
private String yjdhrq; |
|||
/** |
|||
* 收货地址 |
|||
*/ |
|||
private String shdz; |
|||
/** |
|||
* 包装类别 |
|||
*/ |
|||
private String bzlb; |
|||
|
|||
} |
|||
|
|||
|
|||
|
|||
@ -0,0 +1,182 @@ |
|||
package org.nl.wms.database.eas.dto; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.IdType; |
|||
import com.baomidou.mybatisplus.annotation.TableId; |
|||
import lombok.*; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
/** |
|||
* {@code @Description:} (ReceiptBill)查询参数类 |
|||
* {@code @Author:} gbx |
|||
* @since 2024-05-21 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
@EqualsAndHashCode(callSuper = true) |
|||
public class ReceiptBillQuery extends BaseQuery<ReceiptBillQuery> { |
|||
|
|||
|
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 送货单号 |
|||
*/ |
|||
@TableId(value = "djbh", type = IdType.NONE) |
|||
private String djbh; |
|||
|
|||
/** |
|||
* 送贷日期 |
|||
*/ |
|||
private String ywrq; |
|||
|
|||
/** |
|||
* 提交时间 |
|||
*/ |
|||
private String tjsj; |
|||
|
|||
/** |
|||
* 采购订单号 |
|||
*/ |
|||
private String cgbh; |
|||
|
|||
/** |
|||
* 采购公司 |
|||
*/ |
|||
private String cggs; |
|||
|
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
|
|||
/** |
|||
* 物科名称 |
|||
*/ |
|||
private String wlmc; |
|||
|
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
|
|||
/** |
|||
* 单位 |
|||
*/ |
|||
private String jldw; |
|||
|
|||
/** |
|||
* 订单量 |
|||
*/ |
|||
private String ddsl; |
|||
|
|||
/** |
|||
* 本次送货数量 |
|||
*/ |
|||
private String bcshsl; |
|||
|
|||
/** |
|||
* 收货数量 |
|||
*/ |
|||
private String shsl; |
|||
|
|||
/** |
|||
* 件数 |
|||
*/ |
|||
private String num; |
|||
|
|||
/** |
|||
* 收货组织 |
|||
*/ |
|||
private String zzbm; |
|||
|
|||
/** |
|||
* 收货仓库 |
|||
*/ |
|||
private String zzmc; |
|||
|
|||
/** |
|||
* 收货库位 |
|||
*/ |
|||
private String shcw; |
|||
|
|||
/** |
|||
* 是否质检 |
|||
*/ |
|||
private String sfzj; |
|||
|
|||
/** |
|||
* 批次管理 |
|||
*/ |
|||
private String pcgl; |
|||
|
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
|
|||
/** |
|||
* 所属厂区 |
|||
*/ |
|||
private String sscq; |
|||
|
|||
/** |
|||
* 供应商编码 |
|||
*/ |
|||
private String gysbm; |
|||
|
|||
/** |
|||
* 供应商 |
|||
*/ |
|||
private String gys; |
|||
|
|||
/** |
|||
* 到货日期 |
|||
*/ |
|||
private String dhrq; |
|||
|
|||
/** |
|||
* 创建入编码 |
|||
*/ |
|||
private String cjr; |
|||
|
|||
/** |
|||
* 创建日期 |
|||
*/ |
|||
private String cjrq; |
|||
|
|||
/** |
|||
* 采购员 |
|||
*/ |
|||
private String cgy; |
|||
|
|||
/** |
|||
* 送货人 |
|||
*/ |
|||
private String shy; |
|||
|
|||
/** |
|||
* 收货人 |
|||
*/ |
|||
private String shr; |
|||
|
|||
/** |
|||
* 预计到货日期 |
|||
*/ |
|||
private String yjdhrq; |
|||
|
|||
/** |
|||
* 收货地址 |
|||
*/ |
|||
private String shdz; |
|||
|
|||
/** |
|||
* 包装类别 |
|||
*/ |
|||
private String bzlb; |
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,147 @@ |
|||
package org.nl.wms.database.eas.dto; |
|||
|
|||
|
|||
import lombok.Data; |
|||
import lombok.*; |
|||
import lombok.EqualsAndHashCode; |
|||
import org.nl.common.domain.query.BaseQuery; |
|||
import org.nl.wms.database.eas.dao.ReceiptBill; |
|||
|
|||
/** |
|||
* {@code @Description:} (ReceiptBill)查询参数类 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Data |
|||
@Builder |
|||
@ToString |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
@EqualsAndHashCode(callSuper = false) |
|||
public class ReceiptBillVO extends BaseQuery<ReceiptBill> { |
|||
/** |
|||
* 送货单号 |
|||
*/ |
|||
private String djbh; |
|||
/** |
|||
* 送贷日期 |
|||
*/ |
|||
private String ywrq; |
|||
/** |
|||
* 提交时间 |
|||
*/ |
|||
private String tjsj; |
|||
/** |
|||
* 采购订单号 |
|||
*/ |
|||
private String cgbh; |
|||
/** |
|||
* 采购公司 |
|||
*/ |
|||
private String cggs; |
|||
/** |
|||
* 物料编码 |
|||
*/ |
|||
private String wlbm; |
|||
/** |
|||
* 物科名称 |
|||
*/ |
|||
private String wlmc; |
|||
/** |
|||
* 规格型号 |
|||
*/ |
|||
private String ggxh; |
|||
/** |
|||
* 单位 |
|||
*/ |
|||
private String jldw; |
|||
/** |
|||
* 订单量 |
|||
*/ |
|||
private String ddsl; |
|||
/** |
|||
* 本次送货数量 |
|||
*/ |
|||
private String bcshsl; |
|||
/** |
|||
* 收货数量 |
|||
*/ |
|||
private String shsl; |
|||
/** |
|||
* 件数 |
|||
*/ |
|||
private String num; |
|||
/** |
|||
* 收货组织 |
|||
*/ |
|||
private String zzbm; |
|||
/** |
|||
* 收货仓库 |
|||
*/ |
|||
private String zzmc; |
|||
/** |
|||
* 收货库位 |
|||
*/ |
|||
private String shcw; |
|||
/** |
|||
* 是否质检 |
|||
*/ |
|||
private String sfzj; |
|||
/** |
|||
* 批次管理 |
|||
*/ |
|||
private String pcgl; |
|||
/** |
|||
* 批次 |
|||
*/ |
|||
private String pc; |
|||
/** |
|||
* 所属厂区 |
|||
*/ |
|||
private String sscq; |
|||
/** |
|||
* 供应商编码 |
|||
*/ |
|||
private String gysbm; |
|||
/** |
|||
* 供应商 |
|||
*/ |
|||
private String gys; |
|||
/** |
|||
* 到货日期 |
|||
*/ |
|||
private String dhrq; |
|||
/** |
|||
* 创建入编码 |
|||
*/ |
|||
private String cjr; |
|||
/** |
|||
* 创建日期 |
|||
*/ |
|||
private String cjrq; |
|||
/** |
|||
* 采购员 |
|||
*/ |
|||
private String cgy; |
|||
/** |
|||
* 送货人 |
|||
*/ |
|||
private String shy; |
|||
/** |
|||
* 收货人 |
|||
*/ |
|||
private String shr; |
|||
/** |
|||
* 预计到货日期 |
|||
*/ |
|||
private String yjdhrq; |
|||
/** |
|||
* 收货地址 |
|||
*/ |
|||
private String shdz; |
|||
/** |
|||
* 包装类别 |
|||
*/ |
|||
private String bzlb; |
|||
} |
|||
@ -0,0 +1,70 @@ |
|||
package org.nl.wms.database.eas.service; |
|||
|
|||
import org.nl.common.base.CommonPage; |
|||
import org.nl.wms.database.eas.dao.AllocationBill; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.wms.database.eas.dto.AllocationBillVO; |
|||
|
|||
import java.util.List; |
|||
import java.util.Set; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} (AllocationBill)服务接口层 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
public interface IallocationBillService extends IService<AllocationBill> { |
|||
|
|||
|
|||
/** |
|||
* 分页查询 |
|||
* |
|||
* @param params 查询条件 |
|||
* @return CommonPage<AllocationBill> |
|||
*/ |
|||
CommonPage<AllocationBill> page(AllocationBillVO params); |
|||
|
|||
/** |
|||
* 条件查询 |
|||
* |
|||
* @param params 查询条件 |
|||
* @return List<AllocationBill> |
|||
*/ |
|||
List<AllocationBill> query(AllocationBillVO params); |
|||
|
|||
|
|||
/** |
|||
* 单据直接调拨 |
|||
* |
|||
* @param ids / |
|||
*/ |
|||
void allocationConfirm(List<String> ids); |
|||
|
|||
/** |
|||
* 创建 |
|||
* |
|||
* @param entity / |
|||
*/ |
|||
void create(AllocationBillVO entity); |
|||
|
|||
|
|||
/** |
|||
* 编辑 |
|||
* |
|||
* @param entity / |
|||
*/ |
|||
void update(AllocationBillVO entity); |
|||
|
|||
/** |
|||
* 多选删除 |
|||
* |
|||
* @param ids / |
|||
*/ |
|||
void delete(Set<String> ids); |
|||
|
|||
|
|||
} |
|||
|
|||
|
|||
@ -0,0 +1,69 @@ |
|||
package org.nl.wms.database.eas.service; |
|||
|
|||
import org.nl.common.base.CommonPage; |
|||
import org.nl.wms.database.eas.dao.ReceiptBill; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.wms.database.eas.dto.ReceiptBillVO; |
|||
|
|||
import java.util.List; |
|||
import java.util.Set; |
|||
|
|||
|
|||
/** |
|||
* {@code @Description:} (ReceiptBill)服务接口层 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
public interface IreceiptBillService extends IService<ReceiptBill> { |
|||
|
|||
|
|||
/** |
|||
* 分页查询 |
|||
* |
|||
* @param params 查询条件 |
|||
* @return CommonPage<ReceiptBill> |
|||
*/ |
|||
CommonPage<ReceiptBill> page(ReceiptBillVO params); |
|||
|
|||
/** |
|||
* 条件查询 |
|||
* |
|||
* @param params 查询条件 |
|||
* @return List<ReceiptBill> |
|||
*/ |
|||
List<ReceiptBill> query(ReceiptBillVO params); |
|||
|
|||
/** |
|||
* 收货单确认 |
|||
* |
|||
* @param ids / |
|||
*/ |
|||
void receiptConfirm(List<String> ids); |
|||
|
|||
/** |
|||
* 创建 |
|||
* |
|||
* @param entity / |
|||
*/ |
|||
void create(ReceiptBillVO entity); |
|||
|
|||
|
|||
/** |
|||
* 编辑 |
|||
* |
|||
* @param entity / |
|||
*/ |
|||
void update(ReceiptBillVO entity); |
|||
|
|||
/** |
|||
* 多选删除 |
|||
* |
|||
* @param ids / |
|||
*/ |
|||
void delete(Set<String> ids); |
|||
|
|||
|
|||
} |
|||
|
|||
|
|||
@ -0,0 +1,147 @@ |
|||
package org.nl.wms.database.eas.service.impl; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.wms.database.eas.dao.AllocationBill; |
|||
import org.nl.wms.database.eas.dto.AllocationBillVO; |
|||
import org.nl.wms.database.eas.dao.mapper.AllocationBillMapper; |
|||
import org.nl.wms.database.eas.service.IallocationBillService; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|||
import org.springframework.stereotype.Service; |
|||
import cn.hutool.core.util.ObjectUtil; |
|||
import org.springframework.beans.BeanUtils; |
|||
|
|||
import javax.annotation.Resource; |
|||
|
|||
import org.nl.common.base.CommonPage; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.Set; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* {@code @Description:} (AllocationBill)服务实现层 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Service("allocationBillService") |
|||
public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper, AllocationBill> implements IallocationBillService { |
|||
|
|||
|
|||
@Resource |
|||
private AllocationBillMapper allocationBillMapper; |
|||
|
|||
|
|||
/** |
|||
* 分页查询 |
|||
* |
|||
* @param params 查询条件 |
|||
*/ |
|||
@Override |
|||
public CommonPage<AllocationBill> page(AllocationBillVO params) { |
|||
if (StringUtils.isBlank(params.getDjbh())) { |
|||
throw new BadRequestException("单据编号不能为空"); |
|||
} |
|||
// 查询总记录数
|
|||
long totalCount = allocationBillMapper.getTotalCount(params.getDjbh()); |
|||
Page<AllocationBill> pageObject = new Page<>(params.getPage(), params.getSize()); |
|||
Page<AllocationBill> receiptBills = allocationBillMapper.allocationDetailPage(pageObject, params.getDjbh(), params.getFuzzy()); |
|||
return CommonPage.getPage(receiptBills, totalCount); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 根据条件查询 |
|||
* |
|||
* @param params 查询条件 |
|||
*/ |
|||
@Override |
|||
public List<AllocationBill> query(AllocationBillVO params) { |
|||
return allocationBillMapper.selectList(new QueryWrapper<AllocationBill>() |
|||
.lambda() |
|||
.eq(ObjectUtil.isNotEmpty(params), AllocationBill::getDjbh, params.getFuzzy()) |
|||
.or() |
|||
.eq(ObjectUtil.isNotEmpty(params), AllocationBill::getDjid, params.getFuzzy()) |
|||
); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 创建 |
|||
* |
|||
* @param entity 对象实体 |
|||
*/ |
|||
@Override |
|||
public void create(AllocationBillVO entity) { |
|||
allocationBillMapper.insert(getBasicInfo(entity, true)); |
|||
} |
|||
|
|||
/** |
|||
* 单据直接调拨 |
|||
*/ |
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void allocationConfirm(List<String> ids) { |
|||
|
|||
|
|||
} |
|||
|
|||
|
|||
/** |
|||
* 修改调拨单 |
|||
*/ |
|||
@Override |
|||
public void update(AllocationBillVO entity) { |
|||
AllocationBill allocationBill = this.getById(entity.getDjid()); |
|||
if (allocationBill == null) { |
|||
// 如果不存在该记录，则插入数据
|
|||
AllocationBill allocationBillNew = new AllocationBill(); |
|||
BeanUtils.copyProperties(entity, allocationBillNew); |
|||
this.save(allocationBillNew); |
|||
} else { |
|||
// 如果存在该记录，则更新数据
|
|||
BeanUtils.copyProperties(entity, allocationBill); |
|||
this.updateById(allocationBill); |
|||
} |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 多选删除 |
|||
* |
|||
* @param ids 多个Id主键 |
|||
*/ |
|||
@Override |
|||
public void delete(Set<String> ids) { |
|||
// 物理删除
|
|||
allocationBillMapper.deleteBatchIds(ids); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 获取实体基础信息 |
|||
* |
|||
* @param entity 对象实体 |
|||
* @param isCreate 是否创建 |
|||
*/ |
|||
private AllocationBill getBasicInfo(AllocationBillVO entity, boolean isCreate) { |
|||
// if (isCreate) {
|
|||
// entity.setId(IdUtil.getStringId());
|
|||
// entity.setCreate_id(Long.valueOf(SecurityUtils.getCurrentUserId()));
|
|||
// entity.setCreate_name(SecurityUtils.getCurrentNickName());
|
|||
// entity.setCreate_time(DateUtil.now());
|
|||
// }
|
|||
// entity.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
|
|||
// entity.setUpdate_optname(SecurityUtils.getCurrentNickName());
|
|||
// entity.setUpdate_time(DateUtil.now());
|
|||
AllocationBill allocationBill = new AllocationBill(); |
|||
BeanUtils.copyProperties(entity, allocationBill); |
|||
return allocationBill; |
|||
} |
|||
|
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,145 @@ |
|||
package org.nl.wms.database.eas.service.impl; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.wms.database.eas.dao.ReceiptBill; |
|||
import org.nl.wms.database.eas.dto.ReceiptBillVO; |
|||
import org.nl.wms.database.eas.dao.mapper.ReceiptBillMapper; |
|||
import org.nl.wms.database.eas.service.IreceiptBillService; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|||
import org.springframework.stereotype.Service; |
|||
import cn.hutool.core.util.ObjectUtil; |
|||
import org.springframework.beans.BeanUtils; |
|||
|
|||
import javax.annotation.Resource; |
|||
|
|||
import org.nl.common.base.CommonPage; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.Set; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* {@code @Description:} (ReceiptBill)服务实现层 |
|||
* {@code @Author:} gbx |
|||
* |
|||
* @since 2024-05-25 |
|||
*/ |
|||
@Service("receiptBillService") |
|||
public class ReceiptBillServiceImpl extends ServiceImpl<ReceiptBillMapper, ReceiptBill> implements IreceiptBillService { |
|||
|
|||
|
|||
@Resource |
|||
private ReceiptBillMapper receiptBillMapper; |
|||
|
|||
|
|||
/** |
|||
* 分页查询 |
|||
* |
|||
* @param params 查询条件 |
|||
*/ |
|||
@Override |
|||
public CommonPage<ReceiptBill> page(ReceiptBillVO params) { |
|||
if (StringUtils.isBlank(params.getDjbh())) { |
|||
throw new BadRequestException("单据编号不能为空"); |
|||
} |
|||
Page<ReceiptBill> pageObject = new Page<>(params.getPage(), params.getSize()); |
|||
Page<ReceiptBill> receiptBills = receiptBillMapper.receiptDetailPage(pageObject, params.getDjbh(), params.getFuzzy()); |
|||
return CommonPage.getPage(receiptBills); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 根据条件查询 |
|||
* |
|||
* @param params 查询条件 |
|||
*/ |
|||
@Override |
|||
public List<ReceiptBill> query(ReceiptBillVO params) { |
|||
return receiptBillMapper.selectList(new QueryWrapper<ReceiptBill>() |
|||
.lambda() |
|||
.eq(ObjectUtil.isNotEmpty(params), ReceiptBill::getDjbh, params.getFuzzy()) |
|||
.or() |
|||
.eq(ObjectUtil.isNotEmpty(params), ReceiptBill::getWlbm, params.getFuzzy()) |
|||
); |
|||
} |
|||
|
|||
/** |
|||
* 收货单确认 |
|||
*/ |
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void receiptConfirm(List<String> ids) { |
|||
|
|||
|
|||
} |
|||
|
|||
|
|||
/** |
|||
* 创建 |
|||
* |
|||
* @param entity 对象实体 |
|||
*/ |
|||
@Override |
|||
public void create(ReceiptBillVO entity) { |
|||
receiptBillMapper.insert(getBasicInfo(entity, true)); |
|||
} |
|||
|
|||
|
|||
|
|||
/** |
|||
* 修改收货单 |
|||
*/ |
|||
@Override |
|||
public void update(ReceiptBillVO entity) { |
|||
ReceiptBill receiptBill = this.getById(entity.getDjbh()); |
|||
if (receiptBill == null) { |
|||
// 如果不存在该记录，则插入数据
|
|||
ReceiptBill receiptBillNew = new ReceiptBill(); |
|||
BeanUtils.copyProperties(entity, receiptBillNew); |
|||
this.save(receiptBillNew); |
|||
} else { |
|||
// 如果存在该记录，则更新数据
|
|||
BeanUtils.copyProperties(entity, receiptBill); |
|||
this.updateById(receiptBill); |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* 多选删除 |
|||
* |
|||
* @param ids 多个Id主键 |
|||
*/ |
|||
@Override |
|||
public void delete(Set<String> ids) { |
|||
// 物理删除
|
|||
receiptBillMapper.deleteBatchIds(ids); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 获取实体基础信息 |
|||
* |
|||
* @param entity 对象实体 |
|||
* @param isCreate 是否创建 |
|||
*/ |
|||
private ReceiptBill getBasicInfo(ReceiptBillVO entity, boolean isCreate) { |
|||
// if (isCreate) {
|
|||
// entity.setId(IdUtil.getStringId());
|
|||
// entity.setCreate_id(Long.valueOf(SecurityUtils.getCurrentUserId()));
|
|||
// entity.setCreate_name(SecurityUtils.getCurrentNickName());
|
|||
// entity.setCreate_time(DateUtil.now());
|
|||
// }
|
|||
// entity.setUpdate_optid(Long.valueOf(SecurityUtils.getCurrentUserId()));
|
|||
// entity.setUpdate_optname(SecurityUtils.getCurrentNickName());
|
|||
// entity.setUpdate_time(DateUtil.now());
|
|||
ReceiptBill receiptBill = new ReceiptBill(); |
|||
BeanUtils.copyProperties(entity, receiptBill); |
|||
return receiptBill; |
|||
} |
|||
|
|||
|
|||
} |
|||
|
|||
Loading…
Reference in new issue