2/18 槽位区域表 --取货架管理打印未完成

dev_fifo_z
wangwei 5 months ago
parent 9558437f4f
commit 74eb299633

@ -0,0 +1,42 @@
package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.SysWorkplaceRegion;
import com.glxp.api.req.basic.SysWorkplaceRegionRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.SysWorkplaceRegionResponse;
import com.glxp.api.service.basic.SysWorkplaceRegionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @author : zhuzhu
* @date : 2025/2/18 11:04
* @modyified By :
*/
@Slf4j
@RestController
public class SysWorkplaceRegionController extends BaseController {
@Resource
SysWorkplaceRegionService SysWorkplaceRegionService;
@GetMapping("/udiwms/sysWorkplaceRegion/getList")
public BaseResponse getUserBindWork(SysWorkplaceRegionRequest request) {
List<SysWorkplaceRegionResponse> regionResponses = SysWorkplaceRegionService.filterList(request);
PageInfo<SysWorkplaceRegionResponse> pageInfo = new PageInfo<>(regionResponses);
PageSimpleResponse<SysWorkplaceRegionResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(regionResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -0,0 +1,19 @@
package com.glxp.api.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.SysWorkplaceRegion;
import com.glxp.api.req.basic.SysWorkplaceRegionRequest;
import com.glxp.api.res.basic.SysWorkplaceRegionResponse;
import java.util.List;
/**
* @author : zhangsan
* @date : 2025/2/18 11:02
* @modyified By :
*/
public interface SysWorkplaceRegionMapper extends BaseMapper<SysWorkplaceRegion> {
List<SysWorkplaceRegionResponse> filterList(SysWorkplaceRegionRequest request);
}

@ -0,0 +1,21 @@
package com.glxp.api.req.basic;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
* @author : zhuzhu
* @date : 2025/2/18 11:08
* @modyified By :
*/
@Data
public class SysWorkplaceRegionRequest extends ListPageRequest {
private Integer regionCode;
private String regionName;
}

@ -0,0 +1,41 @@
package com.glxp.api.res.basic;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author : zhuzhu
* @date : 2025/2/18 11:09
* @modyified By :
*/
@Data
public class SysWorkplaceRegionResponse {
private Long id;
/**
*
*/
private Integer regionCode;
/**
*
*/
private String regionName;
private Date updateTime;
private Date createTime;
private String updateUser;
private String createUser;
}

@ -0,0 +1,32 @@
package com.glxp.api.service.basic;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.SysWorkplaceRegionMapper;
import com.glxp.api.entity.basic.SysWorkplaceRegion;
import com.glxp.api.req.basic.SysWorkplaceRegionRequest;
import com.glxp.api.res.basic.SysWorkplaceRegionResponse;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class SysWorkplaceRegionService extends ServiceImpl<SysWorkplaceRegionMapper, SysWorkplaceRegion> {
@Resource
SysWorkplaceRegionMapper sysWorkplaceRegionMapper;
public List<SysWorkplaceRegionResponse> filterList(SysWorkplaceRegionRequest request) {
if (null == request) {
return Collections.emptyList();
}
if (null != request.getPage() && null != request.getLimit()) {
PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
}
return super.baseMapper.filterList(request);
}
}

@ -168,7 +168,7 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
//如果为null 当前灯组已满
if (orderLeds.isEmpty()) {
// 如果没有可用灯组,抛出异常或返回 null
throw new JsonException("当前灯组已满!");
throw new JsonException("没有可用灯组!");
}
SysOrderLed orderLed = orderLeds.get(0);
//if 没有满 设置订单id

@ -0,0 +1,16 @@
<?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="com.glxp.api.dao.basic.SysWorkplaceRegionMapper">
<select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceRegionResponse">
select swr.*
from sys_workplace_region swr
<where>
<if test="regionCode != '' and regionCode != null">
AND swr.regionCode =#{regionCode}
</if>
<if test="regionName != null and regionName != ''">
AND swr.regionName like concat('%', #{regionName}, '%')
</if>
</where>
</select>
</mapper>

@ -5159,8 +5159,6 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow',
CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount',
'int NULL DEFAULT NULL COMMENT ''入库码数量''',
1);
@ -5192,11 +5190,11 @@ VALUES (463279, 213, '2', 1, 'macBind', '灯组是否绑定', 'select', NULL, NU
CREATE TABLE IF NOT EXISTS `sys_order_led`
CREATE TABLE IF NOT EXISTS `sys_order_led`
(
`id` int NOT NULL,
`ledNum` tinyint NULL DEFAULT NULL COMMENT '1.红234绿',
`orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号',
`orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
`updateTime` datetime NULL DEFAULT NULL,
`createTime` datetime NULL DEFAULT NULL,
@ -5218,7 +5216,7 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'relCodeCount',
' int DEFAULT ''0'' COMMENT ''关联关系数量''',
1);
INSERT IGNORE INTO sys_scheduled(`id`, `cronName`, `cron`, `customerId`, `remark`)
VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表');
VALUES (510, 'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表');
CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount',
'int NULL DEFAULT NULL COMMENT ''扫码数量''',
@ -5245,3 +5243,20 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'outputMode',
1);
DROP TABLE IF EXISTS `sys_workplace_region`;
CREATE TABLE `sys_workplace_region`
(
`id` bigint NOT NULL,
`regionCode` int NULL DEFAULT NULL COMMENT '区域编号',
`regionName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '区域名称',
`updateTime` datetime NULL DEFAULT NULL,
`createTime` datetime NULL DEFAULT NULL,
`updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
`createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
AUTO_INCREMENT = 8052
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
COMMENT = '槽位区域表'
ROW_FORMAT = Dynamic;

Loading…
Cancel
Save