diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java index 5f62aee..fff194e 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; import io.swagger.annotations.ApiOperation; +import java.util.List; + /** * @Description: * @CreateDate 2024/04/16 @@ -13,4 +15,7 @@ public interface IMesLoadingListService extends IBaseMesService @ApiOperation("根据发运单号查询装车单信息") MesLoadingList getMesLoadingListByShippingCode(String organizeCode, String shippingCode); + void submit(List ids); + + void createVolvoAsn(List ids); } diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesVolvoRackService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesVolvoRackService.java new file mode 100644 index 0000000..e00c0bb --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesVolvoRackService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + + +import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesVolvoRack; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author zxw + */ +public interface IMesVolvoRackService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java index 3314042..33541ea 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java @@ -1,16 +1,57 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Api(description = "装车单主页面") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesLoadingVehiclesOrder") public class MesLoadingListController extends BaseMesController { + @Autowired + private IMesLoadingListService mesLoadingListService; + + @PostMapping(value = "/submit") + @ApiOperation(value = "确认") + public ResultBean submit(@RequestBody List ids) { + try { + mesLoadingListService.submit(ids); + return ResultBean.success("确认成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @PostMapping(value = "/createVolvoAsn") + @ApiOperation(value = "创建沃尔沃的ASN") + public ResultBean createVolvoAsn(@RequestBody List ids) { + try { + mesLoadingListService.createVolvoAsn(ids); + return ResultBean.success("确认成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesVolvoRackController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesVolvoRackController.java new file mode 100644 index 0000000..716c752 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesVolvoRackController.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesVolvoRack; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * volvo 料架 + */ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesVolvoRack") +public class MesVolvoRackController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java index 3b6f0b2..c60ad24 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java @@ -243,4 +243,19 @@ public class MesLoadingListService extends BaseMesService implem DdlPreparedPack.getNumEqualPack(mesLoadingListDetail.getPid(),"id",packBean); return baseRDao.getByProperty(packBean); } + + @Override + public void submit(List ids) { + + } + + @Override + public void createVolvoAsn(List ids) { + + } + + private List getMesLoadingListByIds(List ids) { + List loadingLists = new ArrayList<>(); + return loadingLists; + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java new file mode 100644 index 0000000..77fc890 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesAssemblyNosortCfgService; +import cn.estsh.i3plus.ext.mes.api.base.IMesVolvoRackService; +import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService; +import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesVolvoRack; +import cn.estsh.i3plus.pojo.mes.bean.MesWcEquipment; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class MesVolvoRackService extends BaseMesService implements IMesVolvoRackService { + + @Override + protected void setPackQueryBean(MesVolvoRack bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getRackOwner(), "rackOwner", packBean); + DdlPreparedPack.getNumEqualPack(bean.getRackType(), "rackType", packBean); + } + + @Override + protected void onInsertBean(MesVolvoRack item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getRackOwner(), "料架所有者"); + ValidatorBean.checkNotNull(item.getRackSeq(), "料架系列号不能为空"); + ValidatorBean.checkNotNull(item.getRackType(), "料架类型不能为空"); + ValidatorBean.checkNotNull(item.getPositionTotal(), "位置总数不能为空"); + } + + @Override + protected void onUpdateBean(MesVolvoRack item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getRackOwner(), "料架所有者"); + ValidatorBean.checkNotNull(item.getRackSeq(), "料架系列号不能为空"); + ValidatorBean.checkNotNull(item.getRackType(), "料架类型不能为空"); + ValidatorBean.checkNotNull(item.getPositionTotal(), "位置总数不能为空"); + } + + @Override + public void validateImport(List beanList) { + + for (MesVolvoRack item : beanList) { + // 数据校验 + ValidatorBean.checkNotNull(item.getRackOwner(), "料架所有者"); + ValidatorBean.checkNotNull(item.getRackSeq(), "料架系列号不能为空"); + ValidatorBean.checkNotNull(item.getRackType(), "料架类型不能为空"); + ValidatorBean.checkNotNull(item.getPositionTotal(), "位置总数不能为空"); + + } + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java index c46e4a1..5e879de 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java @@ -90,12 +90,13 @@ public class MesWorkOrderLogService extends BaseMesService impl sql += " and wol.modify_date_time <:endTime "; } - if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) { - sql += " and wol.description >=:postingStartTime "; - } - if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) { - sql += " and wol.description <:postingEndTime "; - } + // TODO jason-temp +// if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) { +// sql += " and wol.description >=:postingStartTime "; +// } +// if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) { +// sql += " and wol.description <:postingEndTime "; +// } if (!StringUtil.isEmpty(mesWorkOrderLog.getWorkOrderNo())) { sql += " and wol.work_order_no ='" + mesWorkOrderLog.getWorkOrderNo() + "' "; @@ -122,12 +123,13 @@ public class MesWorkOrderLogService extends BaseMesService impl queryObject.setParameter("endTime", endTime); } - if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) { - queryObject.setParameter("postingStartTime", mesWorkOrderLog.getActualPostingDateStart()); - } - if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) { - queryObject.setParameter("postingEndTime", mesWorkOrderLog.getActualPostingDateEnd()); - } + // TODO jason-temp +// if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) { +// queryObject.setParameter("postingStartTime", mesWorkOrderLog.getActualPostingDateStart()); +// } +// if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) { +// queryObject.setParameter("postingEndTime", mesWorkOrderLog.getActualPostingDateEnd()); +// } queryObject.unwrap(SQLQuery.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);