From d09d242854b2549b73276acadcb54703b8ceec01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Thu, 5 Jun 2025 17:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E8=B4=A7=E8=AE=A1=E5=88=92=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=80=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 15 +- .../src/main/resources/application-prod.yml | 7 +- .../src/main/resources/logback-spring.xml | 6 +- .../controller/LogisticsRouteController.java | 4 +- .../controller/DeliveryPlanController.java | 48 +++++ .../deliveryplan/entity/DeliveryPlan.java | 10 +- .../mapper/DeliveryPlanMapper.java | 2 + .../mapper/xml/DeliveryPlanMapper.xml | 8 + .../service/IDeliveryPlanService.java | 4 + .../service/impl/DeliveryPlanServiceImpl.java | 13 ++ .../DeliveryPlanDetailController.java | 177 ++++++++++++++++++ .../entity/DeliveryPlanDetail.java | 80 ++++++++ .../mapper/DeliveryPlanDetailMapper.java | 17 ++ .../mapper/xml/DeliveryPlanDetailMapper.xml | 5 + .../service/IDeliveryPlanDetailService.java | 14 ++ .../impl/DeliveryPlanDetailServiceImpl.java | 19 ++ .../controller/VehicleInOutController.java | 9 +- .../controller/DeliveryDemandController.java | 10 + .../mapper/DeliveryDemandMapper.java | 3 + .../mapper/xml/DeliveryDemandMapper.xml | 5 + .../service/IDeliveryDemandService.java | 2 + .../impl/DeliveryDemandServiceImpl.java | 7 + .../impl/VehicleDemandServiceImpl.java | 2 +- 23 files changed, 449 insertions(+), 18 deletions(-) create mode 100644 jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/controller/DeliveryPlanDetailController.java create mode 100644 jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/entity/DeliveryPlanDetail.java create mode 100644 jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/DeliveryPlanDetailMapper.java create mode 100644 jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/xml/DeliveryPlanDetailMapper.xml create mode 100644 jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/IDeliveryPlanDetailService.java create mode 100644 jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/impl/DeliveryPlanDetailServiceImpl.java diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 7cb7eeb..e314640 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ server: include-stacktrace: ALWAYS include-message: ALWAYS servlet: - context-path: /jeecg-boot + context-path: /tms compression: enabled: true min-response-size: 1024 @@ -134,10 +134,15 @@ spring: # username: root # password: 123456 # driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1 - username: SDKTMS - password: SDKTMS - driver-class-name: oracle.jdbc.OracleDriver + url: jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1 + username: SDKTMS + password: SDKTMS + driver-class-name: oracle.jdbc.OracleDriver + wms: + url: jdbc:oracle:thin:@172.22.10.236:1521/mesdb + username: ZIWMS_SAP + password: adm2024 + driver-class-name: oracle.jdbc.OracleDriver # 多数据源配置 #multi-datasource1: #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 16b6e32..58eb4ca 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -7,7 +7,7 @@ server: include-stacktrace: ALWAYS include-message: ALWAYS servlet: - context-path: /jeecg-boot + context-path: /tms compression: enabled: true min-response-size: 1024 @@ -138,6 +138,11 @@ spring: username: SDKTMS password: SDKTMS driver-class-name: oracle.jdbc.OracleDriver + wms: + url: jdbc:oracle:thin:@172.22.10.236:1521/mesdb + username: ZIWMS_SAP + password: adm2024 + driver-class-name: oracle.jdbc.OracleDriver # 多数据源配置 #multi-datasource1: #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml index acad24b..64ab476 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - + @@ -17,7 +17,7 @@ - ${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/tms-%d{yyyy-MM-dd}.%i.log 30 10MB @@ -47,7 +47,7 @@ - ${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html + ${LOG_HOME}/tms-%d{yyyy-MM-dd}.%i.html 30 10MB diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java index 02fe811..4c8c17b 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java @@ -83,7 +83,7 @@ public class LogisticsRouteController extends JeecgController add(@RequestBody LogisticsRoute logisticsRoute) { - logisticsRoute.setRoute(logisticsRoute.getStartCity() + "--->" + + logisticsRoute.setRoute(logisticsRoute.getStartCity() + "-" + logisticsRoute.getTargetCity()); logisticsRouteService.save(logisticsRoute); return Result.OK("添加成功！"); @@ -100,7 +100,7 @@ public class LogisticsRouteController extends JeecgController edit(@RequestBody LogisticsRoute logisticsRoute) { - logisticsRoute.setRoute(logisticsRoute.getStartCity() + "--->" + + logisticsRoute.setRoute(logisticsRoute.getStartCity() + "-" + logisticsRoute.getTargetCity()); logisticsRouteService.updateById(logisticsRoute); return Result.OK("编辑成功!"); diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/controller/DeliveryPlanController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/controller/DeliveryPlanController.java index 4533340..40cef40 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/controller/DeliveryPlanController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/controller/DeliveryPlanController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -22,6 +24,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; +import org.jeecg.modules.tms.carinout.deliveryplandetail.service.IDeliveryPlanDetailService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -29,6 +33,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -53,6 +58,8 @@ public class DeliveryPlanController extends JeecgController add(@RequestBody DeliveryPlan deliveryPlan) { + List deliveryPlanDetailList = deliveryPlan.getDeliveryPlanDetailList(); + String pn = StringUtils.join(deliveryPlanDetailList.stream() + .map(DeliveryPlanDetail::getPn) + .filter(po -> po != null && !po.isEmpty()) + .toArray(), ","); + String unit = StringUtils.join(deliveryPlanDetailList.stream() + .map(DeliveryPlanDetail::getUnit) + .filter(po -> po != null && !po.isEmpty()) + .toArray(), ","); + deliveryPlan.setPn(pn) + .setUnit(unit); String sequence = generalSequenceService.getSequence(GeneralSequenceConstant.IN_DEMAND_NO); deliveryPlan.setSgNo(sequence); deliveryPlanService.save(deliveryPlan); + deliveryPlanDetailList.forEach(item ->{ + item.setDeliveryPlanId(deliveryPlan.getId()); + }); + deliveryPlanDetailService.saveOrUpdateBatch(deliveryPlanDetailList); return Result.OK("添加成功！"); } @@ -99,12 +122,28 @@ public class DeliveryPlanController extends JeecgController edit(@RequestBody DeliveryPlan deliveryPlan) { + List deliveryPlanDetailList = deliveryPlan.getDeliveryPlanDetailList(); + String pn = StringUtils.join(deliveryPlanDetailList.stream() + .map(DeliveryPlanDetail::getPn) + .filter(po -> po != null && !po.isEmpty()) + .toArray(), ","); + String unit = StringUtils.join(deliveryPlanDetailList.stream() + .map(DeliveryPlanDetail::getUnit) + .filter(po -> po != null && !po.isEmpty()) + .toArray(), ","); + deliveryPlan.setPn(pn) + .setUnit(unit); deliveryPlanService.updateById(deliveryPlan); + deliveryPlanDetailList.forEach(item ->{ + item.setDeliveryPlanId(deliveryPlan.getId()); + }); + deliveryPlanDetailService.saveOrUpdateBatch(deliveryPlanDetailList); return Result.OK("编辑成功!"); } @@ -180,4 +219,13 @@ public class DeliveryPlanController extends JeecgController getByPo(String po) { + List strings = deliveryPlanService.getByPo(po); + return Result.OK(strings); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/entity/DeliveryPlan.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/entity/DeliveryPlan.java index 7456639..e05db70 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/entity/DeliveryPlan.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/entity/DeliveryPlan.java @@ -4,12 +4,12 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -113,4 +113,6 @@ public class DeliveryPlan implements Serializable { @Dict(dicCode = "unit") @ApiModelProperty(value = "单位") private java.lang.String unit; + @TableField(exist = false) + private List deliveryPlanDetailList; } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/DeliveryPlanMapper.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/DeliveryPlanMapper.java index c7ed1b2..b36f5ce 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/DeliveryPlanMapper.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/DeliveryPlanMapper.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.tms.carinout.deliveryplan.entity.DeliveryPlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; /** * @Description: 送货计划 @@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface DeliveryPlanMapper extends BaseMapper { + List getByPo(@Param("po") String po); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/xml/DeliveryPlanMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/xml/DeliveryPlanMapper.xml index e6673a9..a789626 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/xml/DeliveryPlanMapper.xml +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/mapper/xml/DeliveryPlanMapper.xml @@ -2,4 +2,12 @@ + diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/IDeliveryPlanService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/IDeliveryPlanService.java index 0f1118b..a526ff2 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/IDeliveryPlanService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/IDeliveryPlanService.java @@ -2,6 +2,9 @@ package org.jeecg.modules.tms.carinout.deliveryplan.service; import org.jeecg.modules.tms.carinout.deliveryplan.entity.DeliveryPlan; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; + +import java.util.List; /** * @Description: 送货计划 @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IDeliveryPlanService extends IService { + List getByPo(String po); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/impl/DeliveryPlanServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/impl/DeliveryPlanServiceImpl.java index 43476dc..aa70c67 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/impl/DeliveryPlanServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplan/service/impl/DeliveryPlanServiceImpl.java @@ -1,12 +1,17 @@ package org.jeecg.modules.tms.carinout.deliveryplan.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; +import lombok.RequiredArgsConstructor; import org.jeecg.modules.tms.carinout.deliveryplan.entity.DeliveryPlan; import org.jeecg.modules.tms.carinout.deliveryplan.mapper.DeliveryPlanMapper; import org.jeecg.modules.tms.carinout.deliveryplan.service.IDeliveryPlanService; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; + /** * @Description: 送货计划 * @Author: jeecg-boot @@ -14,6 +19,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@RequiredArgsConstructor public class DeliveryPlanServiceImpl extends ServiceImpl implements IDeliveryPlanService { + private final DeliveryPlanMapper deliveryPlanMapper; + + @DS("wms") + @Override + public List getByPo(String po) { + return deliveryPlanMapper.getByPo(po); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/controller/DeliveryPlanDetailController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/controller/DeliveryPlanDetailController.java new file mode 100644 index 0000000..0dc84ca --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/controller/DeliveryPlanDetailController.java @@ -0,0 +1,177 @@ +package org.jeecg.modules.tms.carinout.deliveryplandetail.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; +import org.jeecg.modules.tms.carinout.deliveryplandetail.service.IDeliveryPlanDetailService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 送货明细 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +@Api(tags="送货明细") +@RestController +@RequestMapping("/deliveryplandetail/deliveryPlanDetail") +@Slf4j +public class DeliveryPlanDetailController extends JeecgController { + @Autowired + private IDeliveryPlanDetailService deliveryPlanDetailService; + + /** + * 分页列表查询 + * + * @param deliveryPlanDetail + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "送货明细-分页列表查询") + @ApiOperation(value="送货明细-分页列表查询", notes="送货明细-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DeliveryPlanDetail deliveryPlanDetail, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(deliveryPlanDetail, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = deliveryPlanDetailService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param deliveryPlanDetail + * @return + */ + @AutoLog(value = "送货明细-添加") + @ApiOperation(value="送货明细-添加", notes="送货明细-添加") + //@RequiresPermissions("org.jeecg.modules.tms:delivery_plan_detail:add") + @PostMapping(value = "/add") + public Result add(@RequestBody DeliveryPlanDetail deliveryPlanDetail) { + deliveryPlanDetailService.save(deliveryPlanDetail); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param deliveryPlanDetail + * @return + */ + @AutoLog(value = "送货明细-编辑") + @ApiOperation(value="送货明细-编辑", notes="送货明细-编辑") + //@RequiresPermissions("org.jeecg.modules.tms:delivery_plan_detail:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DeliveryPlanDetail deliveryPlanDetail) { + deliveryPlanDetailService.updateById(deliveryPlanDetail); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "送货明细-通过id删除") + @ApiOperation(value="送货明细-通过id删除", notes="送货明细-通过id删除") + //@RequiresPermissions("org.jeecg.modules.tms:delivery_plan_detail:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + deliveryPlanDetailService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "送货明细-批量删除") + @ApiOperation(value="送货明细-批量删除", notes="送货明细-批量删除") + //@RequiresPermissions("org.jeecg.modules.tms:delivery_plan_detail:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.deliveryPlanDetailService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "送货明细-通过id查询") + @ApiOperation(value="送货明细-通过id查询", notes="送货明细-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DeliveryPlanDetail deliveryPlanDetail = deliveryPlanDetailService.getById(id); + if(deliveryPlanDetail==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(deliveryPlanDetail); + } + + /** + * 导出excel + * + * @param request + * @param deliveryPlanDetail + */ + //@RequiresPermissions("org.jeecg.modules.tms:delivery_plan_detail:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DeliveryPlanDetail deliveryPlanDetail) { + return super.exportXls(request, deliveryPlanDetail, DeliveryPlanDetail.class, "送货明细"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("delivery_plan_detail:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DeliveryPlanDetail.class); + } + +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/entity/DeliveryPlanDetail.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/entity/DeliveryPlanDetail.java new file mode 100644 index 0000000..a4f307a --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/entity/DeliveryPlanDetail.java @@ -0,0 +1,80 @@ +package org.jeecg.modules.tms.carinout.deliveryplandetail.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 送货明细 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +@Data +@TableName("delivery_plan_detail") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="delivery_plan_detail对象", description="送货明细") +public class DeliveryPlanDetail implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**PO*/ + @Excel(name = "PO", width = 15) + @ApiModelProperty(value = "PO") + private String po; + /**料号*/ + @Excel(name = "料号", width = 15) + @ApiModelProperty(value = "料号") + private String pn; + /**数量*/ + @Excel(name = "数量", width = 15) + @ApiModelProperty(value = "数量") + private Double planQty; + /**单位*/ + @Excel(name = "单位", width = 15) + @ApiModelProperty(value = "单位") + private String unit; + /**供应商*/ + @Excel(name = "供应商", width = 15) + @ApiModelProperty(value = "供应商") + private String supplier; + /**送货计划 id*/ + private String deliveryPlanId; +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/DeliveryPlanDetailMapper.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/DeliveryPlanDetailMapper.java new file mode 100644 index 0000000..49b96d3 --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/DeliveryPlanDetailMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.tms.carinout.deliveryplandetail.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 送货明细 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +public interface DeliveryPlanDetailMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/xml/DeliveryPlanDetailMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/xml/DeliveryPlanDetailMapper.xml new file mode 100644 index 0000000..a3481e5 --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/mapper/xml/DeliveryPlanDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/IDeliveryPlanDetailService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/IDeliveryPlanDetailService.java new file mode 100644 index 0000000..23518aa --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/IDeliveryPlanDetailService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.tms.carinout.deliveryplandetail.service; + +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 送货明细 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +public interface IDeliveryPlanDetailService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/impl/DeliveryPlanDetailServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/impl/DeliveryPlanDetailServiceImpl.java new file mode 100644 index 0000000..f64aea4 --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/deliveryplandetail/service/impl/DeliveryPlanDetailServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.tms.carinout.deliveryplandetail.service.impl; + +import org.jeecg.modules.tms.carinout.deliveryplandetail.entity.DeliveryPlanDetail; +import org.jeecg.modules.tms.carinout.deliveryplandetail.mapper.DeliveryPlanDetailMapper; +import org.jeecg.modules.tms.carinout.deliveryplandetail.service.IDeliveryPlanDetailService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 送货明细 + * @Author: jeecg-boot + * @Date: 2025-06-05 + * @Version: V1.0 + */ +@Service +public class DeliveryPlanDetailServiceImpl extends ServiceImpl implements IDeliveryPlanDetailService { + +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java index 8c27ca4..94a197c 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java @@ -205,12 +205,17 @@ public class VehicleInOutController extends JeecgController list = vehicleInOutService.list(lambdaQueryWrapper); if (list != null && list.size() > 0) { - return Result.error("已经进行过提货了！"); + if ("1".equals(vehicleInOut.getEfType())) { + return Result.error("已经进行过提货了！"); + } else { + return Result.error("已经进行过送货了！"); + } } vehicleInOut.setVehicleDemandCountId(vehicleInOut.getId()); vehicleInOut.setId(null) .setCreateTime(null) - .setCreateBy(null); + .setCreateBy(null) + .setCurrentStatus("1"); vehicleInOutService.save(vehicleInOut); return Result.OK("提货成功！"); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java index 218fdee..524717d 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java @@ -239,4 +239,14 @@ public class DeliveryDemandController extends JeecgController getShip() { + List strings = deliveryDemandService.getShip(); + return Result.OK(strings); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java index c2f23cc..fa1f8e0 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.tms.outbound.deliverydemand.mapper; import java.util.Date; import java.util.List; +import com.baomidou.dynamic.datasource.annotation.DS; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.tms.outbound.deliverydemand.entity.DeliveryDemand; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -26,4 +27,6 @@ public interface DeliveryDemandMapper extends BaseMapper { * @param currentStatus 当前状态 */ void updateByVdNo(String vdNo, String currentStatus); + + List getShip(); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml index 17b6d98..f0a1099 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml @@ -16,4 +16,9 @@ update tms_delivery_demand set current_status = #{currentStatus} where vd_no = #{vdNo} + + diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java index cd20af1..8919267 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java @@ -34,4 +34,6 @@ public interface IDeliveryDemandService extends IService { * @param currentStatus 当前状态 */ void updateByVdNo(String vdNo, String currentStatus); + + List getShip(); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java index fb7170a..ef5320d 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.tms.outbound.deliverydemand.service.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; @@ -126,4 +127,10 @@ public class DeliveryDemandServiceImpl extends ServiceImpl getShip() { + return deliveryDemandMapper.getShip(); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java index eb52005..6695376 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java @@ -60,7 +60,7 @@ public class VehicleDemandServiceImpl extends ServiceImpl vehicleCounts; - // String: 由车型与车长组成，以逗号分隔 + // String: 由车型、车长、供应商编码组成，以逗号分隔 // Integer: 该种车型与车长选择的数量 Solution solution = findCheapestSolution(iogisticsPriceList, vehicleDemand.getTotalPallets()); // 打印，方便查看，开发时可以打开