diff --git a/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseBasketInfoController.java b/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseBasketInfoController.java new file mode 100644 index 0000000..19b4c31 --- /dev/null +++ b/bgs-admin/src/main/java/com/bgs/web/controller/base/BaseBasketInfoController.java @@ -0,0 +1,127 @@ +package com.bgs.web.controller.base; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.bgs.common.annotation.Log; +import com.bgs.common.enums.BusinessType; +import com.bgs.system.domain.BaseBasketInfo; +import com.bgs.system.service.IBaseBasketInfoService; +import com.bgs.common.core.controller.BaseController; +import com.bgs.common.core.domain.AjaxResult; +import com.bgs.common.utils.poi.ExcelUtil; +import com.bgs.common.core.page.TableDataInfo; + +/** + * 货筐信息Controller + * + * @author wenjy + * @date 2024-07-19 + */ +@Controller +@RequestMapping("/base/basketInfo") +public class BaseBasketInfoController extends BaseController +{ + private String prefix = "base/basketInfo"; + + @Autowired + private IBaseBasketInfoService baseBasketInfoService; + + @RequiresPermissions("base:basketInfo:view") + @GetMapping() + public String basketInfo() + { + return prefix + "/basketInfo"; + } + + /** + * 查询货筐信息列表 + */ + @RequiresPermissions("base:basketInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseBasketInfo baseBasketInfo) + { + startPage(); + List list = baseBasketInfoService.selectBaseBasketInfoList(baseBasketInfo); + return getDataTable(list); + } + + /** + * 导出货筐信息列表 + */ + @RequiresPermissions("base:basketInfo:export") + @Log(title = "货筐信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseBasketInfo baseBasketInfo) + { + List list = baseBasketInfoService.selectBaseBasketInfoList(baseBasketInfo); + ExcelUtil util = new ExcelUtil(BaseBasketInfo.class); + return util.exportExcel(list, "货筐信息数据"); + } + + /** + * 新增货筐信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存货筐信息 + */ + @RequiresPermissions("base:basketInfo:add") + @Log(title = "货筐信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseBasketInfo baseBasketInfo) + { + return toAjax(baseBasketInfoService.insertBaseBasketInfo(baseBasketInfo)); + } + + /** + * 修改货筐信息 + */ + @RequiresPermissions("base:basketInfo:edit") + @GetMapping("/edit/{objId}") + public String edit(@PathVariable("objId") Long objId, ModelMap mmap) + { + BaseBasketInfo baseBasketInfo = baseBasketInfoService.selectBaseBasketInfoByObjId(objId); + mmap.put("baseBasketInfo", baseBasketInfo); + return prefix + "/edit"; + } + + /** + * 修改保存货筐信息 + */ + @RequiresPermissions("base:basketInfo:edit") + @Log(title = "货筐信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseBasketInfo baseBasketInfo) + { + return toAjax(baseBasketInfoService.updateBaseBasketInfo(baseBasketInfo)); + } + + /** + * 删除货筐信息 + */ + @RequiresPermissions("base:basketInfo:remove") + @Log(title = "货筐信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseBasketInfoService.deleteBaseBasketInfoByObjIds(ids)); + } +} diff --git a/bgs-admin/src/main/resources/application-druid.yml b/bgs-admin/src/main/resources/application-druid.yml index 2ed9347..ba34a5c 100644 --- a/bgs-admin/src/main/resources/application-druid.yml +++ b/bgs-admin/src/main/resources/application-druid.yml @@ -6,16 +6,19 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: haiwei@123 + url: jdbc:mysql://10.32.128.150:6606/bgs-rfid-track?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true username: root - password: haiwei@123 + password: Haiwei@123 #150 # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: false - url: - username: - password: + url: + username: + password: # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -39,7 +42,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true @@ -58,4 +61,4 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true diff --git a/bgs-admin/src/main/resources/application.yml b/bgs-admin/src/main/resources/application.yml index de76d35..de475cd 100644 --- a/bgs-admin/src/main/resources/application.yml +++ b/bgs-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 90 servlet: # 应用的访问路径 context-path: / @@ -30,7 +30,7 @@ server: max: 800 # Tomcat启动初始化的线程数，默认值10 min-spare: 100 - + # 日志配置 logging: level: diff --git a/bgs-admin/src/main/resources/templates/base/basketInfo/add.html b/bgs-admin/src/main/resources/templates/base/basketInfo/add.html new file mode 100644 index 0000000..7fdb89f --- /dev/null +++ b/bgs-admin/src/main/resources/templates/base/basketInfo/add.html @@ -0,0 +1,80 @@ + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+
+ + + + + diff --git a/bgs-admin/src/main/resources/templates/base/basketInfo/basketInfo.html b/bgs-admin/src/main/resources/templates/base/basketInfo/basketInfo.html new file mode 100644 index 0000000..d05b5a1 --- /dev/null +++ b/bgs-admin/src/main/resources/templates/base/basketInfo/basketInfo.html @@ -0,0 +1,129 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • + +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/bgs-admin/src/main/resources/templates/base/basketInfo/edit.html b/bgs-admin/src/main/resources/templates/base/basketInfo/edit.html new file mode 100644 index 0000000..fae60c2 --- /dev/null +++ b/bgs-admin/src/main/resources/templates/base/basketInfo/edit.html @@ -0,0 +1,81 @@ + + + + + + + +
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+
+ + + + + diff --git a/bgs-admin/src/main/resources/templates/base/location/stockLedger.html b/bgs-admin/src/main/resources/templates/base/location/stockLedger.html index 0866a73..6dcc6a1 100644 --- a/bgs-admin/src/main/resources/templates/base/location/stockLedger.html +++ b/bgs-admin/src/main/resources/templates/base/location/stockLedger.html @@ -259,13 +259,17 @@ title: '库位编号' }, { - field: 'cargoFrameEpc', - title: '货筐RFID' + field: 'basketCode', + title: '货筐编号' }, { field: 'waybillNumber', title: '运单编号' }, + { + field: 'cargoFrameEpc', + title: '货筐RFID' + }, { field: 'crateTime', title: '绑定时间' @@ -296,4 +300,4 @@ }); - \ No newline at end of file + diff --git a/bgs-system/src/main/java/com/bgs/system/domain/BaseBasketInfo.java b/bgs-system/src/main/java/com/bgs/system/domain/BaseBasketInfo.java new file mode 100644 index 0000000..d48ebee --- /dev/null +++ b/bgs-system/src/main/java/com/bgs/system/domain/BaseBasketInfo.java @@ -0,0 +1,171 @@ +package com.bgs.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.bgs.common.annotation.Excel; +import com.bgs.common.core.domain.BaseEntity; + +/** + * 货筐信息对象 base_basket_info + * + * @author wenjy + * @date 2024-07-19 + */ +public class BaseBasketInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 标识ID */ + private Long objId; + + /** 货筐编号 */ + @Excel(name = "货筐编号") + private String basketCode; + + /** 货筐RFID */ + @Excel(name = "货筐RFID") + private String basketEpc; + + /** 货筐类型 */ + @Excel(name = "货筐类型") + private Long basketType; + + /** 货筐状态 */ + @Excel(name = "货筐状态") + private Long basketStatus; + + /** 是否状态 */ + private Long isFlag; + + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + + public void setBasketCode(String basketCode) + { + this.basketCode = basketCode; + } + + public String getBasketCode() + { + return basketCode; + } + + public void setBasketEpc(String basketEpc) + { + this.basketEpc = basketEpc; + } + + public String getBasketEpc() + { + return basketEpc; + } + + public void setBasketType(Long basketType) + { + this.basketType = basketType; + } + + public Long getBasketType() + { + return basketType; + } + + public void setBasketStatus(Long basketStatus) + { + this.basketStatus = basketStatus; + } + + public Long getBasketStatus() + { + return basketStatus; + } + + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + + public void setCreatedBy(String createdBy) + { + this.createdBy = createdBy; + } + + public String getCreatedBy() + { + return createdBy; + } + + public void setCreatedTime(Date createdTime) + { + this.createdTime = createdTime; + } + + public Date getCreatedTime() + { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) + { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() + { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) + { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() + { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("basketCode", getBasketCode()) + .append("basketEpc", getBasketEpc()) + .append("basketType", getBasketType()) + .append("basketStatus", getBasketStatus()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java b/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java index 92f29b9..6cc0ee9 100644 --- a/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java +++ b/bgs-system/src/main/java/com/bgs/system/domain/LedgerInstantBinding.java @@ -9,7 +9,7 @@ import com.bgs.common.core.domain.BaseEntity; /** * 实时绑定台账对象 ledger_instant_binding - * + * * @author wenjy * @date 2024-07-15 */ @@ -35,42 +35,44 @@ public class LedgerInstantBinding extends BaseEntity private String locationCode; - public void setObjid(Long objid) + private String basketCode; + + public void setObjid(Long objid) { this.objid = objid; } - public Long getObjid() + public Long getObjid() { return objid; } - public void setCargoFrameEpc(String cargoFrameEpc) + public void setCargoFrameEpc(String cargoFrameEpc) { this.cargoFrameEpc = cargoFrameEpc; } - public String getCargoFrameEpc() + public String getCargoFrameEpc() { return cargoFrameEpc; } - public void setWaybillNumber(String waybillNumber) + public void setWaybillNumber(String waybillNumber) { this.waybillNumber = waybillNumber; } - public String getWaybillNumber() + public String getWaybillNumber() { return waybillNumber; } - public void setCrateTime(Date crateTime) + public void setCrateTime(Date crateTime) { this.crateTime = crateTime; } - public Date getCrateTime() + public Date getCrateTime() { return crateTime; } @@ -83,6 +85,14 @@ public class LedgerInstantBinding extends BaseEntity this.locationCode = locationCode; } + public String getBasketCode() { + return basketCode; + } + + public void setBasketCode(String basketCode) { + this.basketCode = basketCode; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/bgs-system/src/main/java/com/bgs/system/mapper/BaseBasketInfoMapper.java b/bgs-system/src/main/java/com/bgs/system/mapper/BaseBasketInfoMapper.java new file mode 100644 index 0000000..d78de93 --- /dev/null +++ b/bgs-system/src/main/java/com/bgs/system/mapper/BaseBasketInfoMapper.java @@ -0,0 +1,61 @@ +package com.bgs.system.mapper; + +import java.util.List; +import com.bgs.system.domain.BaseBasketInfo; + +/** + * 货筐信息Mapper接口 + * + * @author wenjy + * @date 2024-07-19 + */ +public interface BaseBasketInfoMapper +{ + /** + * 查询货筐信息 + * + * @param objId 货筐信息主键 + * @return 货筐信息 + */ + public BaseBasketInfo selectBaseBasketInfoByObjId(Long objId); + + /** + * 查询货筐信息列表 + * + * @param baseBasketInfo 货筐信息 + * @return 货筐信息集合 + */ + public List selectBaseBasketInfoList(BaseBasketInfo baseBasketInfo); + + /** + * 新增货筐信息 + * + * @param baseBasketInfo 货筐信息 + * @return 结果 + */ + public int insertBaseBasketInfo(BaseBasketInfo baseBasketInfo); + + /** + * 修改货筐信息 + * + * @param baseBasketInfo 货筐信息 + * @return 结果 + */ + public int updateBaseBasketInfo(BaseBasketInfo baseBasketInfo); + + /** + * 删除货筐信息 + * + * @param objId 货筐信息主键 + * @return 结果 + */ + public int deleteBaseBasketInfoByObjId(Long objId); + + /** + * 批量删除货筐信息 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseBasketInfoByObjIds(String[] objIds); +} diff --git a/bgs-system/src/main/java/com/bgs/system/service/IBaseBasketInfoService.java b/bgs-system/src/main/java/com/bgs/system/service/IBaseBasketInfoService.java new file mode 100644 index 0000000..32de5d9 --- /dev/null +++ b/bgs-system/src/main/java/com/bgs/system/service/IBaseBasketInfoService.java @@ -0,0 +1,61 @@ +package com.bgs.system.service; + +import java.util.List; +import com.bgs.system.domain.BaseBasketInfo; + +/** + * 货筐信息Service接口 + * + * @author wenjy + * @date 2024-07-19 + */ +public interface IBaseBasketInfoService +{ + /** + * 查询货筐信息 + * + * @param objId 货筐信息主键 + * @return 货筐信息 + */ + public BaseBasketInfo selectBaseBasketInfoByObjId(Long objId); + + /** + * 查询货筐信息列表 + * + * @param baseBasketInfo 货筐信息 + * @return 货筐信息集合 + */ + public List selectBaseBasketInfoList(BaseBasketInfo baseBasketInfo); + + /** + * 新增货筐信息 + * + * @param baseBasketInfo 货筐信息 + * @return 结果 + */ + public int insertBaseBasketInfo(BaseBasketInfo baseBasketInfo); + + /** + * 修改货筐信息 + * + * @param baseBasketInfo 货筐信息 + * @return 结果 + */ + public int updateBaseBasketInfo(BaseBasketInfo baseBasketInfo); + + /** + * 批量删除货筐信息 + * + * @param objIds 需要删除的货筐信息主键集合 + * @return 结果 + */ + public int deleteBaseBasketInfoByObjIds(String objIds); + + /** + * 删除货筐信息信息 + * + * @param objId 货筐信息主键 + * @return 结果 + */ + public int deleteBaseBasketInfoByObjId(Long objId); +} diff --git a/bgs-system/src/main/java/com/bgs/system/service/impl/BaseBasketInfoServiceImpl.java b/bgs-system/src/main/java/com/bgs/system/service/impl/BaseBasketInfoServiceImpl.java new file mode 100644 index 0000000..2ae4a0d --- /dev/null +++ b/bgs-system/src/main/java/com/bgs/system/service/impl/BaseBasketInfoServiceImpl.java @@ -0,0 +1,94 @@ +package com.bgs.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bgs.system.mapper.BaseBasketInfoMapper; +import com.bgs.system.domain.BaseBasketInfo; +import com.bgs.system.service.IBaseBasketInfoService; +import com.bgs.common.core.text.Convert; + +/** + * 货筐信息Service业务层处理 + * + * @author wenjy + * @date 2024-07-19 + */ +@Service +public class BaseBasketInfoServiceImpl implements IBaseBasketInfoService +{ + @Autowired + private BaseBasketInfoMapper baseBasketInfoMapper; + + /** + * 查询货筐信息 + * + * @param objId 货筐信息主键 + * @return 货筐信息 + */ + @Override + public BaseBasketInfo selectBaseBasketInfoByObjId(Long objId) + { + return baseBasketInfoMapper.selectBaseBasketInfoByObjId(objId); + } + + /** + * 查询货筐信息列表 + * + * @param baseBasketInfo 货筐信息 + * @return 货筐信息 + */ + @Override + public List selectBaseBasketInfoList(BaseBasketInfo baseBasketInfo) + { + return baseBasketInfoMapper.selectBaseBasketInfoList(baseBasketInfo); + } + + /** + * 新增货筐信息 + * + * @param baseBasketInfo 货筐信息 + * @return 结果 + */ + @Override + public int insertBaseBasketInfo(BaseBasketInfo baseBasketInfo) + { + return baseBasketInfoMapper.insertBaseBasketInfo(baseBasketInfo); + } + + /** + * 修改货筐信息 + * + * @param baseBasketInfo 货筐信息 + * @return 结果 + */ + @Override + public int updateBaseBasketInfo(BaseBasketInfo baseBasketInfo) + { + return baseBasketInfoMapper.updateBaseBasketInfo(baseBasketInfo); + } + + /** + * 批量删除货筐信息 + * + * @param objIds 需要删除的货筐信息主键 + * @return 结果 + */ + @Override + public int deleteBaseBasketInfoByObjIds(String objIds) + { + return baseBasketInfoMapper.deleteBaseBasketInfoByObjIds(Convert.toStrArray(objIds)); + } + + /** + * 删除货筐信息信息 + * + * @param objId 货筐信息主键 + * @return 结果 + */ + @Override + public int deleteBaseBasketInfoByObjId(Long objId) + { + return baseBasketInfoMapper.deleteBaseBasketInfoByObjId(objId); + } +} diff --git a/bgs-system/src/main/resources/mapper/system/BaseBasketInfoMapper.xml b/bgs-system/src/main/resources/mapper/system/BaseBasketInfoMapper.xml new file mode 100644 index 0000000..5deef5a --- /dev/null +++ b/bgs-system/src/main/resources/mapper/system/BaseBasketInfoMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + select obj_id, basket_code, basket_epc, basket_type, basket_status, is_flag, created_by, created_time, updated_by, updated_time from base_basket_info + + + + + + + + insert into base_basket_info + + basket_code, + basket_epc, + basket_type, + basket_status, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{basketCode}, + #{basketEpc}, + #{basketType}, + #{basketStatus}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_basket_info + + basket_code = #{basketCode}, + basket_epc = #{basketEpc}, + basket_type = #{basketType}, + basket_status = #{basketStatus}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete from base_basket_info where obj_id = #{objId} + + + + delete from base_basket_info where obj_id in + + #{objId} + + + + \ No newline at end of file diff --git a/bgs-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/bgs-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml index 5c862dc..b737aa8 100644 --- a/bgs-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml +++ b/bgs-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml @@ -26,18 +26,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select obj_id, location_code, location_name, localtion_type, location_describe, store_code, max_amount, used_amount, max_volume, used_volume, location_status, is_flag, remark, created_by, created_time, updated_by, updated_time from base_location_info + @@ -120,4 +139,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml b/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml index 25c30ef..1f31e13 100644 --- a/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml +++ b/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml @@ -3,13 +3,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + @@ -17,16 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +