UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_unify
wangwei 12 months ago
parent 186ccd438a 9115551dfd
commit f0be935b0b
5 changed files with 319 additions and 303 deletions
Show Stats Download Patch File Download Diff File

37
src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
Unescape Escape View File

@ -77,9 +77,9 @@ public class SysWorkplaceQueueController extends BaseController {
String scanCode = request.getScanCode(); String scanCode = request.getScanCode();
if (StrUtil.isNotEmpty(scanCode)){ if (StrUtil.isNotEmpty(scanCode)) {
UdiEntity udi = FilterUdiUtils.getUdi(scanCode); UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
if (udi != null ) request.setNameCode(udi.getUdi()); if (udi != null) request.setNameCode(udi.getUdi());
} }
request.setScanCode(null); request.setScanCode(null);
@ -94,9 +94,9 @@ public class SysWorkplaceQueueController extends BaseController {
@GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList") @GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList")
public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) { public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) {
String scanCode = request.getScanCode(); String scanCode = request.getScanCode();
if (StrUtil.isNotEmpty(scanCode)){ if (StrUtil.isNotEmpty(scanCode)) {
UdiEntity udi = FilterUdiUtils.getUdi(scanCode); UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
if (udi != null ) request.setNameCode(udi.getUdi()); if (udi != null) request.setNameCode(udi.getUdi());
} }
request.setScanCode(null); request.setScanCode(null);
@ -112,7 +112,7 @@ public class SysWorkplaceQueueController extends BaseController {
@GetMapping("/udiwms/sysWorkplaceQueue/getByCode") @GetMapping("/udiwms/sysWorkplaceQueue/getByCode")
public BaseResponse getByCode(SysWorkplaceQueueRequest request) { public BaseResponse getByCode(SysWorkplaceQueueRequest request) {
List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request); List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
if (list.size() == 0){ if (list.size() == 0) {
return ResultVOUtils.error("当前工位未绑定取货槽！"); return ResultVOUtils.error("当前工位未绑定取货槽！");
} }
SysWorkplaceQueueResponse sysWorkplaceQueueResponse = list.get(0); SysWorkplaceQueueResponse sysWorkplaceQueueResponse = list.get(0);
@ -200,18 +200,18 @@ public class SysWorkplaceQueueController extends BaseController {
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/sysWorkplaceQueue/add/layer") @PostMapping("/udiwms/sysWorkplaceQueue/add/layer")
public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request){ public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request) {
sysWorkplaceQueueService.addLayer(request,getUserId()); sysWorkplaceQueueService.addLayer(request, getUserId());
return ResultVOUtils.success("增加成功"); return ResultVOUtils.success("增加成功");
} }
@PostMapping("/udiwms/WorkplaceQueue/bind") @PostMapping("/udiwms/WorkplaceQueue/bind")
public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest){ public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest) {
String relId = sysWorkplaceQueueBindRequest.getRelId(); String relId = sysWorkplaceQueueBindRequest.getRelId();
List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId)); List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
if (CollUtil.isNotEmpty(list)){ if (CollUtil.isNotEmpty(list)) {
return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑"); return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑");
} }
@ -232,14 +232,14 @@ public class SysWorkplaceQueueController extends BaseController {
* 根据货位槽号 获取 货位槽信息 * 根据货位槽号 获取 货位槽信息
*/ */
@PostMapping("/udiwms/sysWorkplaceQueue/getInfoByCode") @PostMapping("/udiwms/sysWorkplaceQueue/getInfoByCode")
public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request){ public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request) {
String code = request.getCode(); String code = request.getCode();
if (StrUtil.isEmpty(code)){ if (StrUtil.isEmpty(code)) {
return ResultVOUtils.error("货位槽码不能为空"); return ResultVOUtils.error("货位槽码不能为空");
} }
List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request); List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
if (CollUtil.isEmpty(list)){ if (CollUtil.isEmpty(list)) {
return ResultVOUtils.error("未找到该货位槽码的信息"); return ResultVOUtils.error("未找到该货位槽码的信息");
} }
SysWorkplaceQueueResponse sysWorkplaceQueue = list.get(0); SysWorkplaceQueueResponse sysWorkplaceQueue = list.get(0);
@ -254,20 +254,21 @@ public class SysWorkplaceQueueController extends BaseController {
* 根据货位槽号 获取 货位槽信息 * 根据货位槽号 获取 货位槽信息
*/ */
@PostMapping("/udiwms/sysWorkplaceQueue/getProductByCode") @PostMapping("/udiwms/sysWorkplaceQueue/getProductByCode")
public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request){ public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request) {
String udiCode = request.getUdiCode(); String udiCode = request.getUdiCode();
if (StrUtil.isEmpty(udiCode)){ if (StrUtil.isEmpty(udiCode)) {
return ResultVOUtils.error("UDI码不能为空"); return ResultVOUtils.error("UDI码不能为空");
} }
UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode); UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode);
if (byNameCode == null){ if (byNameCode == null) {
return ResultVOUtils.error("UDI码未能识别出对应产品"); return ResultVOUtils.error("无法识别该编码");
} }
String relId = byNameCode.getRelId(); String relId = byNameCode.getRelId();
List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId)); List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
if (CollUtil.isNotEmpty(list)){ if (CollUtil.isNotEmpty(list)) {
return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑"); return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑");
} }
@ -278,7 +279,7 @@ public class SysWorkplaceQueueController extends BaseController {
* 解除绑定 * 解除绑定
*/ */
@PostMapping("/udiwms/sysWorkplaceQueue/removeProduct") @PostMapping("/udiwms/sysWorkplaceQueue/removeProduct")
public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request){ public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request) {
sysWorkplaceQueueService.removeProduct(request); sysWorkplaceQueueService.removeProduct(request);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

6
src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java
Unescape Escape View File

@ -75,16 +75,16 @@ public class SyncDataSetEntity {
private int deviceInfo; //设备信息管理 private int deviceInfo; //设备信息管理
private int deviceCheck;//巡检管理 private int deviceCheck;//巡检管理
// private int deviceCheckDetail;//巡检设备具体信息 // private int deviceCheckDetail;//巡检设备具体信息
// private int deviceCheckDetailItem;//巡检设备项目表 // private int deviceCheckDetailItem;//巡检设备项目表
private int deviceRepairApply;//报修管理 private int deviceRepairApply;//报修管理
// private int deviceRepairDetail;//报修明细 // private int deviceRepairDetail;//报修明细
// private int deviceRepair;//维修单 // private int deviceRepair;//维修单
private int deviceUpkeep;//保养单 private int deviceUpkeep;//保养单
private int produceBusiness;//生产企业 PRODUCE_BUSINESS_DATA private int produceBusiness;//生产企业 PRODUCE_BUSINESS_DATA
/** /**
* 设备任务 * 药品关联关系同步
*/ */
private int drugDataTask; private int drugDataTask;

12
src/main/java/com/glxp/api/service/basic/UdiProductService.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.glxp.api.dao.basic.SupEvaluateDetailMapper;
import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiProductDao;
import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.SupEvaluateDetailEntity; import com.glxp.api.entity.basic.SupEvaluateDetailEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.CodeRel;
@ -107,8 +108,15 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
} }
public UdiProductEntity findByNameCode(String nameCode) { public UdiProductEntity findByNameCode(String nameCode) {
String prefix = FilterUdiUtils.getDiStr(nameCode); // String prefix = FilterUdiUtils.getDiStr(nameCode);
return udiProductDao.findByNameCode(prefix);
if (nameCode.length() > 13) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode);
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
}
}
return udiProductDao.findByNameCode(nameCode);
} }
public UdiProductEntity findById(String id) { public UdiProductEntity findById(String id) {

11
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -167,10 +167,10 @@
<select id="findByNameCode" parameterType="java.lang.String" <select id="findByNameCode" parameterType="java.lang.String"
resultType="com.glxp.api.entity.basic.UdiProductEntity"> resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT basic_products.*,basic_udirel.purType,basic_udirel.hcType,basic_udirel.id as relId SELECT basic_products.*, basic_udirel.purType, basic_udirel.hcType, basic_udirel.id as relId
FROM basic_products FROM basic_products
LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
WHERE (basic_products.nameCode = #{nameCode}) WHERE (basic_products.nameCode = #{nameCode} or basic_products.ybbm = #{nameCode})
limit 1 limit 1
</select> </select>
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity"> <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
@ -194,7 +194,8 @@
catalogname3, catalogname3,
matrial, matrial,
destinyType, destinyType,
productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg, productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
majorStatus, physicType, medicareType, bzgg,
requireScanCode) requireScanCode)
values (#{id}, #{uuid}, values (#{id}, #{uuid},
#{originUuid}, #{originUuid},
@ -1002,7 +1003,6 @@
<if test="matrial != null"> <if test="matrial != null">
matrial=#{matrial}, matrial=#{matrial},
</if> </if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
@ -1291,6 +1291,7 @@
</select> </select>
<select id="selectListByUuid" resultType="com.glxp.api.entity.basic.UdiProductEntity"> <select id="selectListByUuid" resultType="com.glxp.api.entity.basic.UdiProductEntity">
select * select *
from basic_products where uuid = #{uuid} from basic_products
where uuid = #{uuid}
</select> </select>
</mapper> </mapper>

6
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -4825,3 +4825,9 @@ CREATE TABLE IF NOT EXISTS `third_ali_drug`
CHARACTER SET = utf8mb4 CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic; ROW_FORMAT = Dynamic;
CALL Pro_Temp_ColumnWork('sync_data_set', 'drugDataTask',
' tinyint NULL DEFAULT NULL COMMENT ''药品关联关系同步''',
1);

Write Preview
Loading…
Cancel
Save