diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java index 9c48597c..0c89f2d9 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java @@ -299,6 +299,11 @@ public class MesPurchaseOrder extends BaseEntity { private String orderStatusStr; + private String overtimeFlag; + + private String bomFlag; + + private String projectName;//项目名称 public Long getSerialNumber() { return serialNumber; @@ -780,6 +785,30 @@ public class MesPurchaseOrder extends BaseEntity { this.orderStatusStr = orderStatusStr; } + public String getOvertimeFlag() { + return overtimeFlag; + } + + public void setOvertimeFlag(String overtimeFlag) { + this.overtimeFlag = overtimeFlag; + } + + public String getBomFlag() { + return bomFlag; + } + + public void setBomFlag(String bomFlag) { + this.bomFlag = bomFlag; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-api/pom.xml b/hw-api/pom.xml index 4781d1fc..25f9c640 100644 --- a/hw-api/pom.xml +++ b/hw-api/pom.xml @@ -13,7 +13,6 @@ hw-api-tdengine hw-api-mes hw-api-ems - hw-api-printer hw-api-dms hw-api-job hw-api-jindie diff --git a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java index 95adb62d..e974efb5 100644 --- a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java +++ b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java @@ -93,6 +93,8 @@ public class TokenController { // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + userInfo.setNickname(userInfo.getSysUser().getNickName()); + // 获取登录token return R.ok(tokenService.createToken(userInfo)); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index 92521713..c1eb1870 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -387,7 +387,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS } Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修 dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING); @@ -476,7 +476,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS } Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH); dmsBillsFaultInstance.setRealEndTime(currentDate); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java index 3aefe490..5a42e15a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -102,7 +102,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate()); dmsBillsInspectInstance.setIsFlag("1"); dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT); - dmsBillsInspectInstance.setCreateBy(SecurityUtils.getUsername()); + dmsBillsInspectInstance.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); int i = dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance); // List dmsBillsInspectInstances = dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance); //新建第一步工单实例节点 @@ -296,7 +296,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta dmsBillsInspectInstance.setInspectInstanceId(dmsInspectInstanceDetail.getInspectInstanceId()); dmsBillsInspectInstance.setRealEndTime(new Date()); int i = dmsBillsInspectInstanceMapper.updateDmsBillsInspectInstance(dmsBillsInspectInstance); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); dmsInspectInstanceDetail.setUpdateTime(currentDate); dmsInspectInstanceDetail.setUpdateBy(userName); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java index 55c08333..89924a76 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java @@ -248,7 +248,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer } Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); if (lubeStatus.equals(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE)) {//待润滑 dmsBillsLubeInstance.setLubeStatus(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING); @@ -297,7 +297,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer } Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); DmsBillsLubeDetail queryLubeDetail = new DmsBillsLubeDetail(); queryLubeDetail.setLubeInstanceId(lubeInstanceId); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java index 1405f0f9..e8207c51 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java @@ -134,7 +134,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService dmsPlanInspect.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60)); dmsPlanInspect.setIsFlag("1"); - dmsPlanInspect.setCreateBy(SecurityUtils.getUsername()); + dmsPlanInspect.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanInspect.setCreateTime(DateUtils.getNowDate()); //获取设备总数 Long aLong = dmsBaseInspectRouteMapper.selectAmountByInspectRouteId(dmsPlanInspect.getInspectRouteId()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java index f65cde3a..8c65cea5 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java @@ -54,7 +54,7 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService @Override public int insertDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail) { - dmsPlanLubeDetail.setCreateBy(SecurityUtils.getUsername()); + dmsPlanLubeDetail.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanLubeDetail.setCreateTime(DateUtils.getNowDate()); dmsPlanLubeDetail.setIsFlag(1l); return dmsPlanLubeDetailMapper.insertDmsPlanLubeDetail(dmsPlanLubeDetail); @@ -69,7 +69,7 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService @Override public int updateDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail) { - dmsPlanLubeDetail.setUpdateBy(SecurityUtils.getUsername()); + dmsPlanLubeDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanLubeDetail.setUpdateTime(DateUtils.getNowDate()); return dmsPlanLubeDetailMapper.updateDmsPlanLubeDetail(dmsPlanLubeDetail); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java index 4e5c591a..82395a09 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java @@ -111,7 +111,7 @@ public class DmsPlanLubeServiceImpl implements IDmsPlanLubeService { dmsPlanLube.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60)); dmsPlanLube.setIsFlag("1"); - dmsPlanLube.setCreateBy(SecurityUtils.getUsername()); + dmsPlanLube.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanLube.setCreateTime(DateUtils.getNowDate()); int rows = dmsPlanLubeMapper.insertDmsPlanLube(dmsPlanLube); @@ -159,7 +159,7 @@ public class DmsPlanLubeServiceImpl implements IDmsPlanLubeService { Long timeLimitHours = dmsPlanLube.getTimeLimitHours() == null ? 0L : dmsPlanLube.getTimeLimitHours(); dmsPlanLube.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60)); - dmsPlanLube.setUpdateBy(SecurityUtils.getUsername()); + dmsPlanLube.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanLube.setUpdateTime(DateUtils.getNowDate()); return dmsPlanLubeMapper.updateDmsPlanLube(dmsPlanLube); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java index 8d0c1319..d0e7688f 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java @@ -57,7 +57,7 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService public int insertDmsPlanMaintDetail(DmsPlanMaintDetail dmsPlanMaintDetail) { if (dmsPlanMaintDetail.getDeviceId()==null){throw new ServiceException("设备名称不能为空");} - dmsPlanMaintDetail.setCreateBy(SecurityUtils.getUsername()); + dmsPlanMaintDetail.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanMaintDetail.setCreateTime(DateUtils.getNowDate()); dmsPlanMaintDetail.setIsFlag(1l); Long stationId = dmsPlanMaintDetailMapper.selectStationIdByCode(dmsPlanMaintDetail.getMaintStationCode()); @@ -76,7 +76,7 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService @Override public int updateDmsPlanMaintDetail(DmsPlanMaintDetail dmsPlanMaintDetail) { - dmsPlanMaintDetail.setUpdateBy(SecurityUtils.getUsername()); + dmsPlanMaintDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanMaintDetail.setUpdateTime(DateUtils.getNowDate()); Long stationId = dmsPlanMaintDetailMapper.selectStationIdByCode(dmsPlanMaintDetail.getMaintStationCode()); dmsPlanMaintDetail.setMaintStationId(stationId); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java index 1e076f22..292c7e36 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java @@ -114,7 +114,7 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService { dmsPlanMaint.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60)); dmsPlanMaint.setIsFlag(1l); - dmsPlanMaint.setCreateBy(SecurityUtils.getUsername()); + dmsPlanMaint.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanMaint.setCreateTime(DateUtils.getNowDate()); int rows = dmsPlanMaintMapper.insertDmsPlanMaint(dmsPlanMaint); @@ -162,7 +162,7 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService { Long timeLimitHours = dmsPlanMaint.getTimeLimitHours() == null?0L:dmsPlanMaint.getTimeLimitHours(); dmsPlanMaint.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60)); - dmsPlanMaint.setUpdateBy(SecurityUtils.getUsername()); + dmsPlanMaint.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsPlanMaint.setUpdateTime(DateUtils.getNowDate()); return dmsPlanMaintMapper.updateDmsPlanMaint(dmsPlanMaint); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java index 56fb2af7..aa223dcb 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java @@ -111,9 +111,9 @@ public class DmsRecordAlarmInfoServiceImpl implements IDmsRecordAlarmInfoService @Override public int handleDmsRecordAlarmInfo(DmsRecordAlarmInfo dmsRecordAlarmInfo) { dmsRecordAlarmInfo.setAlarmStatus(DmsConstants.DMS_ALARM_STATUS_ARTIFICIAL_HANDLE); - dmsRecordAlarmInfo.setHandleUser(SecurityUtils.getUsername()); + dmsRecordAlarmInfo.setHandleUser(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsRecordAlarmInfo.setHandleTime(DateUtils.getNowDate()); - dmsRecordAlarmInfo.setUpdateBy(SecurityUtils.getUsername()); + dmsRecordAlarmInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsRecordAlarmInfo.setUpdateTime(DateUtils.getNowDate()); return dmsRecordAlarmInfoMapper.updateDmsRecordAlarmInfo(dmsRecordAlarmInfo); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java index 19a8375a..cc5930cb 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java @@ -55,7 +55,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService @Override public int insertDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown) { - dmsRecordShutDown.setCreateBy(SecurityUtils.getUsername()); + dmsRecordShutDown.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsRecordShutDown.setCreateTime(DateUtils.getNowDate()); return dmsRecordShutDownMapper.insertDmsRecordShutDown(dmsRecordShutDown); } @@ -69,7 +69,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService @Override public int updateDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown) { - dmsRecordShutDown.setUpdateBy(SecurityUtils.getUsername()); + dmsRecordShutDown.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); dmsRecordShutDown.setUpdateTime(DateUtils.getNowDate()); return dmsRecordShutDownMapper.updateDmsRecordShutDown(dmsRecordShutDown); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java index 2eddae11..bf61696b 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java @@ -37,7 +37,7 @@ public class FifthMesBorderController { } /** - * 工单生产时长 + * 工单生产时长（右中） */ @GetMapping("/orderTime") public AjaxResult orderTime(){ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesImportController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesImportController.java index 874923b1..48f9c125 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesImportController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesImportController.java @@ -74,7 +74,7 @@ public class MesImportController extends BaseController { @PostMapping(("/raiseCapitalImportData")) public AjaxResult raiseCapitalImportData(MultipartFile file, boolean updateSupport) { - String operName = SecurityUtils.getUsername(); + String operName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); String message = mesImportService.raiseCapitalImportData(file, updateSupport, operName); return success(message); } @@ -92,7 +92,7 @@ public class MesImportController extends BaseController { @PostMapping(("/raiseCapitalImportDataTest")) public AjaxResult raiseCapitalImportDataTest(MultipartFile file, boolean updateSupport) { - String operName = SecurityUtils.getUsername(); + String operName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); String message = mesImportService.raiseCapitalImportDataTest(file, updateSupport, operName); return success(message); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java index 0f23f972..9620091d 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java @@ -212,6 +212,8 @@ public class MesProductPlan extends BaseEntity private String orderStatus;//生产工单状态 + private BigDecimal instockAmount;//入库数量 + public Long getSaleOrderId() { return saleOrderId; } @@ -657,6 +659,14 @@ public class MesProductPlan extends BaseEntity this.orderStatus = orderStatus; } + public BigDecimal getInstockAmount() { + return instockAmount; + } + + public void setInstockAmount(BigDecimal instockAmount) { + this.instockAmount = instockAmount; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java index 82a550e7..b5ac4f0c 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java @@ -203,6 +203,10 @@ public class MesSaleOrder extends BaseEntity { private String isReleaseStr; + private String overtimeFlag; + + private String projectName;//项目名称 + public String getMaterialModel() { return materialModel; @@ -484,6 +488,22 @@ public class MesSaleOrder extends BaseEntity { this.isReleaseStr = isReleaseStr; } + public String getOvertimeFlag() { + return overtimeFlag; + } + + public void setOvertimeFlag(String overtimeFlag) { + this.overtimeFlag = overtimeFlag; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java index e833f8e5..8ff6f870 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductPlanMapper.java @@ -170,5 +170,13 @@ public interface MesProductPlanMapper */ public List selectMesProductPlanJoinUserListByProductOrderId(Long productOrderId); + /** + * 查询生产派工,根据plancode获取已经入库的成品数量 + * + * @param planCode 生产计划编号(唯一索引) + * @return 生产派工 + */ + public MesProductPlan selectOnlyProductPlanWithInstockByPlanCode(String planCode); + } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java index c1844aee..365d1275 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseAttachInfoServiceImpl.java @@ -83,7 +83,7 @@ public class MesBaseAttachInfoServiceImpl implements IMesBaseAttachInfoService public int updateMesBaseAttachInfo(MesBaseAttachInfo mesBaseAttachInfo) { mesBaseAttachInfo.setUpdateTime(DateUtils.getNowDate()); - mesBaseAttachInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseAttachInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); return mesBaseAttachInfoMapper.updateMesBaseAttachInfo(mesBaseAttachInfo); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java index fc92f763..7f8b4a3f 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java @@ -276,7 +276,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService @Override public int generateNoPurchaseRawBarcode(MesBaseBarcodeInfo mesBaseBarcodeInfo) { Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); BigDecimal barcodeAmount = mesBaseBarcodeInfo.getBarcodeAmount(); List toInsertedBarcodeInfos = new ArrayList<>(); @@ -304,7 +304,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService @Override public int generateRegularRawBarcode(MesBaseBarcodeInfo mesBaseBarcodeInfo) { Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); MesBaseBarcodeInfo queryBaseBarcodeInfo = new MesBaseBarcodeInfo(); queryBaseBarcodeInfo.setPurchaseOrderId(mesBaseBarcodeInfo.getPurchaseOrderId()); queryBaseBarcodeInfo.setMaterialId(mesBaseBarcodeInfo.getMaterialId()); @@ -336,7 +336,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService String barcode = Seq.getId(Seq.mesCompBarcodeSeqType, Seq.mesCompBarcodeCode); Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); String planCode = mesBaseBarcodeInfo.getPlanCode(); String planDetailCode = mesBaseBarcodeInfo.getPlanDetailCode(); @@ -445,9 +445,6 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService } - - - mesBaseBarcodeInfo.setPalletInfoCode(rawBarcode.getPalletInfoCode());//重新绑定托盘号 mesBaseBarcodeInfo.setBindStatus(MesConstants.MES_BARCODE_BIND_STATUS_BINDING); @@ -525,7 +522,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService } int barcodeAmount = mesBaseBarcodeInfo.getBarcodeAmount().intValue(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); for (int i = 0; i < barcodeAmount; i++) { @@ -604,7 +601,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService if (StringUtils.isNotEmpty(dbBaseBarcodeInfo.getPrintFlag()) && dbBaseBarcodeInfo.getPrintFlag().equals(MesConstants.MES_BARCODE_PRINT_FLAG_YES)) { throw new ServiceException("此条码已经打印，不能修改"); } - mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate()); return mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo); } @@ -621,7 +618,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService MesBaseBarcodeInfo dbBaseBarcodeInfo = mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeInfo(mesBaseBarcodeInfo.getBarcodeInfo()); if (StringUtils.isEmpty(dbBaseBarcodeInfo.getPlanCode())) { mesBaseBarcodeInfo.setBarcodeId(dbBaseBarcodeInfo.getBarcodeId()); - mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate()); return mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo); } else { @@ -701,6 +698,9 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService try { String hostIp = IpUtils.getIpAddr(); + if(hostIp.equals("192.168.2.26")){ + hostIp = "192.168.2.10"; + } String printKey = "print_" + hostIp; redisTemplate.opsForList().rightPush(printKey, printContentJson.toString()); // redisTemplate.convertAndSend("print_10.10.3.119", printContentJson.toString()); @@ -725,9 +725,9 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService Date currentDate = new Date(); mesBaseBarcodeInfo.setUpdateTime(currentDate); - mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesBaseBarcodeInfo.setPrintTime(DateUtils.getNowDate()); - mesBaseBarcodeInfo.setPrintPerson(SecurityUtils.getUsername()); + mesBaseBarcodeInfo.setPrintPerson(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesBaseBarcodeInfo.setPrintFlag(MesConstants.MES_BARCODE_PRINT_FLAG_YES); mesBaseBarcodeInfo.setPrintNumber(mesBaseBarcodeInfo.getPrintNumber() == null ? 1L : mesBaseBarcodeInfo.getPrintNumber() + 1); mesBaseBarcodeInfo.setAcceptedDate(currentDate); @@ -831,7 +831,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService } productBarcodeInfo.setBindBarcode(materialBarcode); - productBarcodeInfo.setBindBy(SecurityUtils.getUsername()); + productBarcodeInfo.setBindBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); productBarcodeInfo.setBindTime(new Date()); productBarcodeInfo.setBindStatus(MesConstants.MES_BARCODE_BIND_STATUS_BINDING); productBarcodeInfo.setPlanDetailCode(planDetailCode); @@ -928,7 +928,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService boolean palletInfoCodeRepeat = false; String palletInfoCode = ""; String barcodeInfo = ""; - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = DateUtils.getNowDate(); if (productBarcodesArr != null) { StringBuilder materialNameBuilder = new StringBuilder(); @@ -1254,7 +1254,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService throw new ServiceException(errorMsg); } - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); MesBaseAbandonBarcode mesBaseAbandonBarcode = new MesBaseAbandonBarcode(); mesBaseAbandonBarcode.setBarcodeId(mesBaseBarcodeInfo.getBarcodeId()); @@ -1327,8 +1327,49 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService } +// /** +// * 1楼和4楼入库时校验成品条码 +// * +// * @param materialBarcode +// * @return +// */ +// @Override +// public int check4thFloorProduceInstock(String materialBarcode) { +// MesBaseBarcodeInfo mesBaseBarcodeInfo = mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeInfo(materialBarcode); +// if (mesBaseBarcodeInfo == null) { +// throw new ServiceException("物料条码有误"); +// } +// String planCode = mesBaseBarcodeInfo.getPlanCode(); +// MesProductPlan mesProductPlan = mesProductPlanMapper.selectOnlyProductPlanWithInstockByPlanCode(planCode); +// if (mesProductPlan == null) { +// throw new ServiceException("未找到生产计划"); +// } +// +// BigDecimal instockAmount = mesProductPlan.getInstockAmount() == null ? BigDecimal.ZERO : mesProductPlan.getInstockAmount(); +// if (mesProductPlan.getPlanAmount().compareTo(instockAmount) <= 0) { +// throw new ServiceException("此生产计划计划生产数量：" + mesProductPlan.getPlanAmount() + ",已入库数量：" + instockAmount + ",不能再入库"); +// } +// +// String planDetailCode = mesBaseBarcodeInfo.getPlanDetailCode(); +// if (StringUtils.isNotEmpty(planDetailCode)) { +// MesProductPlanDetail mesProductPlanDetail = mesProductPlanDetailMapper.selectMesProductPlanDetailByPlanDetailCode(planDetailCode); +// if (mesProductPlanDetail == null) { +// throw new ServiceException("未找到生产计划明细"); +// } +// } +// +// +//// if (!mesProductOrder.getSaleType().equals(MesConstants.MES_PRODUCT_ORDER_INTERNAL)) { +//// throw new ServiceException("此生产任务为外部销售，不能直接出库"); +//// } +// +// +// return 1; +// } + + /** - * 校验条码是否是内部销售，可以直接出库 + * 出库时校验成品条码 * * @param materialBarcode * @return @@ -1339,12 +1380,24 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService if (mesBaseBarcodeInfo == null) { throw new ServiceException("物料条码有误"); } - String planCode = mesBaseBarcodeInfo.getPlanCode(); - MesProductOrder mesProductOrder = mesProductOrderMapper.selectMesProductOrderByPlanCode(planCode); - if (mesProductOrder == null) { - throw new ServiceException("未找到生产任务"); +// String planCode = mesBaseBarcodeInfo.getPlanCode(); +// MesProductPlan mesProductPlan = mesProductPlanMapper.selectOnlyMesProductPlanByPlanCode(planCode); +// if (mesProductPlan == null) { +// throw new ServiceException("未找到生产计划"); +// } + + String planDetailCode = mesBaseBarcodeInfo.getPlanDetailCode(); + if (StringUtils.isNotEmpty(planDetailCode)) { + MesProductPlanDetail mesProductPlanDetail = mesProductPlanDetailMapper.selectMesProductPlanDetailByPlanDetailCode(planDetailCode); + if (mesProductPlanDetail == null) { + throw new ServiceException("未找到生产计划明细"); + } + if (!mesProductPlanDetail.getPlanDetailStatus().equals(MesConstants.MES_PRODUCT_PLAN_DETAIL_STATUS_FINISH)) { + throw new ServiceException("此生产计划明细还未结束"); + } } + // if (!mesProductOrder.getSaleType().equals(MesConstants.MES_PRODUCT_ORDER_INTERNAL)) { // throw new ServiceException("此生产任务为外部销售，不能直接出库"); // } @@ -1370,7 +1423,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService return false; } mesBaseBarcodeInfo.setBarcodeId(dbMesBaseBarcodeInfo.getBarcodeId()); - mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate()); updateSize += mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo); } @@ -1388,7 +1441,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService @Transactional(rollbackFor = Exception.class) public int generateMergeRawBarcode(MesBaseBarcodeInfo mesBaseBarcodeInfo) { Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); List mesSaleOrderRelateList = mesBaseBarcodeInfo.getMesSaleOrderRelateList(); List toUpdatedMaterialBoms = new ArrayList<>(); @@ -1703,7 +1756,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService @Transactional(rollbackFor = Exception.class) public int updateMergeRawBarcode(MesBaseBarcodeInfo mesBaseBarcodeInfo) { Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); String barcodeInfo = mesBaseBarcodeInfo.getBarcodeInfo(); //修改后的合并信息 diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java index bbda6e60..1fe18622 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java @@ -219,14 +219,12 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi List allStockAlarmDetailList = new ArrayList<>(); stockAlarm(allStockAlarmDetailList, alarmInfoId, 1, nickName, currentDate); if (allStockAlarmDetailList==null || allStockAlarmDetailList.isEmpty()) { - return 1; + throw new ServiceException("无库存预警信息"); } else { List sysPointRouterList = new ArrayList<>(); SysPointRouter sysPointRouter = getSysPointRouter(alarmInfoId, nickName, currentDate); sysPointRouterList.add(sysPointRouter); remoteSysCommonService.insertSysPointRouterPort(sysPointRouterList, SecurityConstants.INNER); - - } return 1; } @@ -250,7 +248,7 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi List allStockAlarmDetailList = new ArrayList<>(); MesBaseMaterialInfo queryMaterialInfo = new MesBaseMaterialInfo(); Integer pageSize = 100; - Integer pageNum = startRow / pageSize + 1; + Integer pageNum = startRow / pageSize+1; PageHelper.startPage(pageNum, 100, ""); List mesBaseMaterialInfoList = mesBaseMaterialInfoMapper.selectMaterialInfoStockInfos(queryMaterialInfo); for (MesBaseMaterialInfo mesBaseMaterialInfo : mesBaseMaterialInfoList) { @@ -258,7 +256,7 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi if (safeStockAmount != null) { BigDecimal stockAmount = mesBaseMaterialInfo.getStockAmount() == null ? BigDecimal.ZERO : mesBaseMaterialInfo.getStockAmount(); //如果库存数量小于安全库存 - if (stockAmount.compareTo(safeStockAmount) < 1) { + if (stockAmount.compareTo(safeStockAmount) < 0) { MesStockAlarmDetail mesStockAlarmDetail = new MesStockAlarmDetail(); mesStockAlarmDetail.setAlarmInfoId(alarmInfoId); mesStockAlarmDetail.setMaterialId(mesBaseMaterialInfo.getMaterialId()); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java index d3ce2123..e85f8c49 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseStationInfoServiceImpl.java @@ -72,7 +72,7 @@ public class MesBaseStationInfoServiceImpl implements IMesBaseStationInfoService @Override public int updateMesBaseStationInfo(MesBaseStationInfo mesBaseStationInfo) { mesBaseStationInfo.setUpdateTime(DateUtils.getNowDate()); - mesBaseStationInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseStationInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); return mesBaseStationInfoMapper.updateMesBaseStationInfo(mesBaseStationInfo); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java index f85158bc..96dbb82e 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java @@ -561,20 +561,22 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService { public List getMaterialUsages(MesProductOrder mesProductOrder) { String saleType = mesProductOrder.getSaleType(); MesProductOrder queryProductOrder = new MesProductOrder(); - if (saleType.equals(MesConstants.MES_PRODUCT_ORDER_SALE)) {//外部销售 - Long materialId = mesProductOrder.getMaterialId(); - queryProductOrder.setMaterialId(materialId); - } else {//对内生产 - Long produceMaterialId = mesProductOrder.getProduceMaterialId(); - queryProductOrder.setProduceMaterialId(produceMaterialId); - } +// if (saleType.equals(MesConstants.MES_PRODUCT_ORDER_SALE)) {//外部销售 +// Long materialId = mesProductOrder.getMaterialId(); +// queryProductOrder.setMaterialId(materialId); +// } else {//对内生产 +// Long produceMaterialId = mesProductOrder.getProduceMaterialId(); +// queryProductOrder.setProduceMaterialId(produceMaterialId); +// } + queryProductOrder.setMaterialBomId(mesProductOrder.getMaterialBomId()); queryProductOrder.setSaleOrderId(mesProductOrder.getSaleOrderId()); List mesProductOrders = mesProductOrderMapper.selectMesProductOrderList(queryProductOrder); //工单状态：0-待发布；1-已发布；2-已完成；3-已开始；4-暂停；8-已撤回；9-已删除 //找到派工数量大于0，并且状态是已发布或者已开始的或者暂停的 List filterProductOrders = mesProductOrders.stream().filter(p -> (p.getDispatchAmount() != null && p.getDispatchAmount().compareTo(BigDecimal.ONE) >= 0) && - (p.getOrderStatus().equals(MesConstants.PUBLISHED) || p.getOrderStatus().equals(MesConstants.BEGIN) || p.getOrderStatus().equals(MesConstants.PAUSE)) + (p.getOrderStatus().equals(MesConstants.PUBLISHED) || p.getOrderStatus().equals(MesConstants.BEGIN) + || p.getOrderStatus().equals(MesConstants.PAUSE) ||p.getProductOrderId().equals(mesProductOrder.getProductOrderId())) ).collect(Collectors.toList()); //先根据saleorderid和安全库存查询总库存和已出库的数量 diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java index 316cf9f3..4d4d9ce1 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java @@ -430,7 +430,7 @@ public class MesProductPlanDetailServiceImpl implements IMesProductPlanDetailSer // } Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); BigDecimal planAmount = null; // BigDecimal dispatchAmount = null; //获取计划数量 @@ -563,7 +563,7 @@ public class MesProductPlanDetailServiceImpl implements IMesProductPlanDetailSer Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Long userId = SecurityUtils.getUserId(); String planDetailCode = Seq.getId(Seq.mesProductPlanDetailSeqType, Seq.mesProductPlanDetailCode); @@ -850,7 +850,7 @@ public class MesProductPlanDetailServiceImpl implements IMesProductPlanDetailSer mesProductPlanDetail.setPlanDetailStatus(MesConstants.MES_PRODUCT_PLAN_DETAIL_STATUS_STARTED); mesProductPlanDetail.setUpdateTime(new Date()); - mesProductPlanDetail.setUpdateBy(SecurityUtils.getUsername()); + mesProductPlanDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); return mesProductPlanDetailMapper.updateMesProductPlanDetail(mesProductPlanDetail); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java index 5af2a3d0..7e622df8 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java @@ -337,7 +337,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { } } else { mesProductPlan.setPlanAmount(mesProductPlan.getDispatchAmount()); - mesProductPlan.setCreateBy(SecurityUtils.getUsername()); + mesProductPlan.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesProductPlan.setCreateTime(DateUtils.getNowDate()); mesProductPlan.setPlanCode(Seq.getId(Seq.planCodeSeqType, Seq.planCodeCode)); if (mesProductPlan.getSaleOrderId() == null) { @@ -595,7 +595,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { throw new ServiceException("此条码为非原材料条码"); } - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); MesMaterialCheckResult mesMaterialCheckResult = mesMaterialCheckResultMapper. selectMesMaterialCheckResultByUI(planId, planDetailId, materialId); @@ -679,7 +679,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { MesMaterialAssignInfo mesMaterialAssignInfo = new MesMaterialAssignInfo(); mesMaterialAssignInfo.setMaterialBarcode(materialBarcode); mesMaterialAssignInfo.setStationId(stationId); - mesMaterialAssignInfo.setCreateBy(SecurityUtils.getUsername()); + mesMaterialAssignInfo.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesMaterialAssignInfo.setCreateTime(currentDate); mesMaterialAssignInfoMapper.insertMesMaterialAssignInfo(mesMaterialAssignInfo); @@ -757,7 +757,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { MesProductOrder mesProductOrder = mesProductOrderService.selectMesProductOrderByProductOrderId(mesProductPlanDeleteVo.getProductOrderId()); BigDecimal dispatchedAmount = mesProductOrder.getDispatchAmount(); mesProductOrder.setDispatchAmount(dispatchedAmount.subtract(dispatchAmount)); - mesProductOrder.setUpdateBy(SecurityUtils.getUsername()); + mesProductOrder.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesProductOrder.setUpdateTime(new Date()); return mesProductOrderMapper.updateMesProductOrder(mesProductOrder); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyServiceImpl.java index 1d75d81f..4546061f 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyServiceImpl.java @@ -278,7 +278,7 @@ public class MesPurchaseApplyServiceImpl implements IMesPurchaseApplyService { mesPurchaseApply.setUpdateTime(currentDate); mesPurchaseApply.setSyncTime(currentDate); mesPurchaseApply.setSyncStatus(MesConstants.MES_PURCHASE_APPALY_SYNC_YES); - mesPurchaseApply.setUpdateBy(SecurityUtils.getUsername()); + mesPurchaseApply.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); mesPurchaseApplyMapper.updateMesPurchaseApply(mesPurchaseApply); JSONArray jsonArray = new JSONArray(); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java index 052cdf4b..97280c84 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java @@ -317,6 +317,9 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService { */ @Override public List unbindPurchaseOrderList(MesPurchaseOrder mesPurchaseOrder) { + if(StringUtils.isNotEmpty(mesPurchaseOrder.getBomFlag()) &&mesPurchaseOrder.getBomFlag().equals("0")){ + mesPurchaseOrder.setMaterialBomId(null); + } return mesPurchaseOrderMapper.unbindPurchaseOrderList(mesPurchaseOrder); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesSaleOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesSaleOrderServiceImpl.java index 87ce7304..c6b2767b 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesSaleOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesSaleOrderServiceImpl.java @@ -142,30 +142,35 @@ public class MesSaleOrderServiceImpl implements IMesSaleOrderService { mesSaleOrder.setMaterialSpec(StringUtils.isNotEmpty(mesSaleOrder.getMaterialSpec()) ? mesSaleOrder.getMaterialSpec().replaceAll("\\s+", "") : ""); if (mesSaleOrder.getMaterialId() != null) { - MesMaterialBom queryMaterialBom = new MesMaterialBom(); - queryMaterialBom.setMaterialId(mesSaleOrder.getMaterialId()); - List mesMaterialBoms = mesMaterialBomMapper.selectMesMaterialBomList(queryMaterialBom); - if (mesMaterialBoms != null && !mesMaterialBoms.isEmpty()) { - StringBuilder parentIdsBuilder = new StringBuilder(); - for (MesMaterialBom mesMaterialBom : mesMaterialBoms) { - String ancestors = mesMaterialBom.getAncestors(); - int commaIndex = ancestors.indexOf(","); - if (commaIndex >= 0) { - String ancestorPostfix = ancestors.substring(commaIndex + 1); - commaIndex = ancestorPostfix.indexOf(","); + MesBaseMaterialInfo mesBaseMaterialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialId(mesSaleOrder.getMaterialId()); + if (StringUtils.isEmpty(mesBaseMaterialInfo.getAccessoriesFlag()) || !mesBaseMaterialInfo.getAccessoriesFlag().equals("0")) { + MesMaterialBom queryMaterialBom = new MesMaterialBom(); + queryMaterialBom.setMaterialId(mesSaleOrder.getMaterialId()); + List mesMaterialBoms = mesMaterialBomMapper.selectMesMaterialBomList(queryMaterialBom); + if (mesMaterialBoms != null && !mesMaterialBoms.isEmpty()) { + StringBuilder parentIdsBuilder = new StringBuilder(); + for (MesMaterialBom mesMaterialBom : mesMaterialBoms) { + String ancestors = mesMaterialBom.getAncestors(); + int commaIndex = ancestors.indexOf(","); if (commaIndex >= 0) { - ancestorPostfix = ancestorPostfix.substring(commaIndex + 1); + String ancestorPostfix = ancestors.substring(commaIndex + 1); + commaIndex = ancestorPostfix.indexOf(","); + if (commaIndex >= 0) { + ancestorPostfix = ancestorPostfix.substring(commaIndex + 1); + } + parentIdsBuilder.append(",").append(ancestorPostfix); } - parentIdsBuilder.append(",").append(ancestorPostfix); + } + String parentIds = parentIdsBuilder.toString().replaceFirst(",", ""); + mesSaleOrder.setParentIds(parentIds); + return mesSaleOrderMapper.selectMesSaleOrderJoinMaterialList(mesSaleOrder); + } else { + return new ArrayList<>(); } - - String parentIds = parentIdsBuilder.toString().replaceFirst(",", ""); - mesSaleOrder.setParentIds(parentIds); - return mesSaleOrderMapper.selectMesSaleOrderJoinMaterialList(mesSaleOrder); } else { - return new ArrayList<>(); + return mesSaleOrderMapper.selectMesSaleOrderJoinMaterialList(mesSaleOrder); } } else { @@ -216,7 +221,7 @@ public class MesSaleOrderServiceImpl implements IMesSaleOrderService { mesBaseBarcodeInfo.setSaleOrderId(mesBaseBarcodeInfoTransferVo.getSaleOrderId()); mesBaseBarcodeInfo.setSaleorderCode(mesBaseBarcodeInfoTransferVo.getSaleOrderCode()); mesBaseBarcodeInfo.setSafeFlag(mesBaseBarcodeInfoTransferVo.getSafeFlag()); - mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getUsername()); + mesBaseBarcodeInfo.setUpdateBy(SecurityUtils.getLoginUser() == null ? SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getNickname()); mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate()); updateSize += mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo); } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml index f723d8ae..d2c7d7ff 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml @@ -433,6 +433,7 @@ bbi.barcode_type, bbi.barcode_info, bbi.material_id, + bbi.po_no, bmi.material_code, bmi.material_name, bmi.material_spec @@ -449,6 +450,7 @@ and replace(bmi.material_spec,' ','') like concat('%', #{materialSpec}, '%') and bbi.barcode_info like concat('%', #{barcodeInfo},'%') + and bbi.po_no like concat('%', #{poNo},'%') @@ -459,9 +461,11 @@ bmi.material_id, bmi.material_code, bmi.material_name, - bmi.material_spec + bmi.material_spec, + mbbi.po_no from wms_location_barcode wlb left join mes_base_material_info bmi on bmi.material_id = wlb.material_id + left join mes_base_barcode_info mbbi on wlb.barcode_info=mbbi.barcode_info and wlb.location_code = #{locationCode} and bmi.material_code like concat('%', #{materialCode},'%') @@ -469,6 +473,7 @@ and replace(bmi.material_spec,' ','') like concat('%', #{materialSpec}, '%') and wlb.barcode_info like concat('%', #{barcodeInfo},'%') + and mbbi.po_no like concat('%', #{poNo},'%') diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml index b35286a0..75b34cc7 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml @@ -389,6 +389,7 @@ (select ifnull(sum(total_amount),0) from wms_stock_total wst where wst.material_id=mbmi.material_id) as stock_amount from mes_base_material_info mbmi + mbmi.safe_stock_amount is not null and mbmi.safe_stock_amount > 0 and erp_id = #{erpId} diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml index cad0a5c0..70aa408c 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml @@ -382,8 +382,8 @@ AND (plan_begin_time <= #{params.planEndTime} AND plan_end_time >= #{params.planBeginTime}) - and mpo.order_status in ('0','1','3','4') and mpo.plan_end_time is not null and mpo.plan_end_time < now() - and mpo.plan_end_time is not null and mpo.plan_end_time >= now() + and mpo.order_status in ('0','1','3','4') and mpo.plan_delivery_date is not null and mpo.plan_delivery_date < now() + and mpo.plan_delivery_date is not null and mpo.plan_delivery_date >= now() order by mpo.product_order_id desc @@ -545,7 +545,9 @@ ( select max(real_begin_time) real_begin_time - from mes_produce_statistics_detail where product_order_status='2')) group by a.real_begin_time ,a.real_end_time,a.process_id ,a.product_order_id + from mes_produce_statistics_detail mpsd where + exists (select 1 from mes_product_order mpo where mpsd.product_order_id=mpo.product_order_id and mpo.order_status='2' and mpo.dispatch_id=4))) + group by a.real_begin_time ,a.real_end_time,a.process_id ,a.product_order_id order by process_id + + + + + + + diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml index d252b260..ef169f51 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml @@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -301,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mbmi.material_spec like concat('%', #{materialSpec}, '%') and mbmi.always_flag = #{alwaysFlag} and exists (select 1 from mes_material_bom mmb where mmb.erp_material_id=mpo.material_id and mmb.ancestors like concat('0,', #{materialBomId}, '%') ) + and mbmi.accessories_flag='0' order by mpo.erp_modify_date desc,mpo.po_no ,mpo.material_name @@ -413,9 +415,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mpo.order_amount, mpo.complete_amount, mpo.approve_date, mpo.erp_modify_date, mpo.plan_delivery_date, mpo.begin_date, mpo.end_date, mpo.order_status, mpo.complete_date, mpo.specification_parameter, mpo.src_bill_no, mpo.purchase_org_id, mpo.tond_base, - mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbmi.always_flag + mbmi.material_code,mbmi.material_name,mbmi.material_spec,mbmi.always_flag,mpi.project_name from mes_purchase_order mpo left join mes_base_material_info mbmi on mpo.material_id =mbmi.erp_id - + left join mes_project_info mpi on mpo.tond_base=mpi.erp_id and mpo.po_no like concat('%', #{poNo}, '%') and mbmi.material_code like concat('%', #{materialCode}, '%') @@ -424,6 +426,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" '%') and replace(mpo.specification_parameter,' ','') like concat('%', #{specificationParameter}, '%') + and mpi.project_name like concat('%', #{projectName}, + '%') + and mpo.order_status = #{orderStatus} and mbmi.always_flag = #{alwaysFlag} @@ -441,6 +446,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mpo.src_bill_no like concat('%', #{srcBillNo}, '%') and mpo.tond_base like concat('%', #{tondBase}, '%') and exists (select 1 from mes_order_bind mob where mob.purchase_order_id=mpo.purchase_order_id and mob.sale_order_id=#{saleOrderId}) + and mpo.order_status in ('1','2') and mpo.plan_delivery_date is not null and mpo.plan_delivery_date < now() + and mpo.plan_delivery_date is not null and mpo.plan_delivery_date >= now() order by mpo.erp_modify_date desc diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml index ac508333..2422a63c 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml @@ -39,6 +39,7 @@ + @@ -252,9 +253,11 @@ mso.begin_date, mso.end_date, mso.complete_date, - mso.sale_order_classfication + mso.sale_order_classfication, + mpi.project_name from mes_sale_order mso left join mes_base_material_info mbmi on - (mso.material_id = mbmi.erp_id and mso.sale_order_classfication='1') or (mso.material_id = mbmi.material_id and mso.sale_order_classfication='2') + ((mso.material_id = mbmi.erp_id and mso.sale_order_classfication='1') or (mso.material_id = mbmi.material_id and mso.sale_order_classfication='2')) + left join mes_project_info mpi on mso.tond_base=mpi.erp_id and mso.saleorder_code like concat('%', #{saleorderCode}, '%') @@ -265,13 +268,19 @@ and replace(mbmi.material_spec,' ','') like concat('%', #{materialSpec}, '%') + and mpi.project_name like concat('%', #{projectName}, + '%') + and mso.is_release = #{isRelease} and mso.sale_order_id = #{saleOrderId} and mso.sale_order_classfication = #{saleOrderClassfication} and exists (select 1 from mes_sale_order_relate msor where mso.sale_order_id = msor.relate_sale_order_id and msor.sale_order_id=#{virtualSaleOrderId}) and not exists (select 1 from mes_sale_order_relate msor where mso.sale_order_id = msor.relate_sale_order_id) and exists (select 1 from mes_material_bom mmb where mmb.erp_material_id=mso.material_id and mmb.material_bom_id in (${parentIds})) + and mso.is_release in ('0','1','2') and mso.plan_delivery_date is not null and mso.plan_delivery_date < now() + and mso.plan_delivery_date is not null and mso.plan_delivery_date >= now() + order by mso.erp_modify_date desc diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java index de234f2b..848a6634 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java @@ -77,7 +77,7 @@ public class QmsCheckProjectServiceImpl implements IQmsCheckProjectService qmsCheckProject.setDownDiff(null); } - qmsCheckProject.setUpdateBy(SecurityUtils.getUsername()); + qmsCheckProject.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); qmsCheckProject.setUpdateTime(DateUtils.getNowDate()); return qmsCheckProjectMapper.updateQmsCheckProject(qmsCheckProject); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceActivityServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceActivityServiceImpl.java index 884f5379..15a844cb 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceActivityServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceActivityServiceImpl.java @@ -92,11 +92,11 @@ public class QmsQualityInstanceActivityServiceImpl implements IQmsQualityInstanc QmsQualityInstanceActivity activity = qmsQualityInstanceActivities.get(0); //赋值 activity.setCreateTime(DateUtils.getNowDate()); - activity.setCreateBy(SecurityUtils.getUsername()); + activity.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); activity.setStartTime(DateUtils.getNowDate()); activity.setProcessHandleStatus("1"); activity.setHandleUserId(SecurityUtils.getUserId()); - activity.setHandleBy(SecurityUtils.getUsername()); + activity.setHandleBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); activity.setProcessHandleResolution(qmsQualityInstanceActivity.getProcessHandleResolution()); activity.setProcessHandleDesc(qmsQualityInstanceActivity.getProcessHandleDesc()); activity.setQmsCheckInstanceFileList(qmsQualityInstanceActivity.getQmsCheckInstanceFileList()); diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceServiceImpl.java index 140eaec1..1d554217 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsQualityInstanceServiceImpl.java @@ -166,7 +166,7 @@ public class QmsQualityInstanceServiceImpl implements IQmsQualityInstanceService qmsQualityInstanceActivity.setProcessHandleResolution(" "); qmsQualityInstanceActivity.setStartTime(DateUtils.getNowDate()); qmsQualityInstanceActivity.setHandleUserId(SecurityUtils.getUserId()); - qmsQualityInstanceActivity.setHandleBy(SecurityUtils.getUsername()); + qmsQualityInstanceActivity.setHandleBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); insertQmsCheckInstanceFile(qmsQualityInstanceActivity, qmsQualityInstance.getFileUrls()); qmsQualityInstanceActivities.add(qmsQualityInstanceActivity); @@ -270,7 +270,7 @@ public class QmsQualityInstanceServiceImpl implements IQmsQualityInstanceService Long checkResultId = qmsQualityInstanceActivityVo.getCheckResultId(); QmsQualityInstance qmsQualityInstance = qmsQualityInstanceMapper.selectQmsQualityInstanceByCheckResultId(checkResultId); Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); //todo:权限校验 if (qmsQualityInstance == null) { qmsQualityInstance = new QmsQualityInstance(); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsLocationBarcode.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsLocationBarcode.java index 276fa345..f16ca041 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsLocationBarcode.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsLocationBarcode.java @@ -44,6 +44,8 @@ public class WmsLocationBarcode extends BaseEntity { private String materialSpec; + private String poNo; + public void setLocationBarcodeId(Long locationBarcodeId) { this.locationBarcodeId = locationBarcodeId; @@ -101,6 +103,14 @@ public class WmsLocationBarcode extends BaseEntity { this.materialSpec = materialSpec; } + public String getPoNo() { + return poNo; + } + + public void setPoNo(String poNo) { + this.poNo = poNo; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsInventoryCheckServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsInventoryCheckServiceImpl.java index 426480c0..1e349a57 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsInventoryCheckServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsInventoryCheckServiceImpl.java @@ -98,7 +98,7 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService { // } // } - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser() == null ? SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); WmsBaseWarehouse baseWarehouse = wmsBaseWarehouseMapper.selectWmsBaseWarehouseByWarehouseId(warehouseId); @@ -408,7 +408,7 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService { existedInventoryCheckDetail.setRealAmount(realAmount); existedInventoryCheckDetail.setUpdateDate(new Date()); - existedInventoryCheckDetail.setUpdateBy(SecurityUtils.getUsername()); + existedInventoryCheckDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); return wmsInventoryCheckDetailMapper.updateWmsInventoryCheckDetail(existedInventoryCheckDetail); } @@ -440,7 +440,7 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService { // List inventoryCheckDetailIds = wmsInventoryCheckDetailList.stream().map(WmsInventoryCheckDetail::getInventoryCheckDetailId).collect(Collectors.toList()); Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); wmsInventoryCheckDetailList.forEach(wmsInventoryCheckDetail -> { wmsInventoryCheckDetail.setCheckStatus(WmsConstants.WMS_INVENTORY_CHECK_DETAIL_STATUS_FINISH); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductInstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductInstockServiceImpl.java index d00fabca..a67b0616 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductInstockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductInstockServiceImpl.java @@ -185,7 +185,7 @@ public class WmsProductInstockServiceImpl implements IWmsProductInstockService { } Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); if (baseBarcodeInfo.getMaterialId().equals(0L)) {//代表4楼到5楼合并的条码 String rawMaterialBarcode = baseBarcodeInfo.getProductBarcode(); @@ -465,7 +465,7 @@ public class WmsProductInstockServiceImpl implements IWmsProductInstockService { } // } - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); WmsProductInstock wmsProductInstock = new WmsProductInstock(); wmsProductInstock.setTaskCode(Seq.getId(Seq.productInstockSeqType, Seq.productInstockCode)); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockDetailServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockDetailServiceImpl.java index a3110236..916cd594 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockDetailServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockDetailServiceImpl.java @@ -154,7 +154,7 @@ public class WmsProductOutstockDetailServiceImpl implements IWmsProductOutstockD throw new ServiceException(String.format("出库申请数量为%1$s，不能再出库", applyQty)); } - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); //更新出库记录 if (applyQty.compareTo(currentOutstockQty) == 0) { diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockServiceImpl.java index 0db30e34..56d6d568 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductOutstockServiceImpl.java @@ -145,7 +145,7 @@ public class WmsProductOutstockServiceImpl implements IWmsProductOutstockService auditStatus = WmsConstants.WMS_AUDIT_STATUS_TOAUDIT; } - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); wmsProductOutstock.setProductType(WmsConstants.WMS_PRODUCT_OUTSTOCK_PRODUCT_TYPE_PRODUCT); wmsProductOutstock.setOperationType(operationType); @@ -298,7 +298,7 @@ public class WmsProductOutstockServiceImpl implements IWmsProductOutstockService productOutstockDetail.setExecuteStatus(WmsConstants.WMS_EXECUTE_STATUS_CONFIRM); productOutstockDetail.setConfirmAmount(BigDecimal.ONE); productOutstockDetail.setUpdateDate(new Date()); - productOutstockDetail.setUpdateBy(SecurityUtils.getUsername()); + productOutstockDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); return wmsProductOutstockDetailMapper.updateWmsProductOutstockDetail(productOutstockDetail); } @@ -365,7 +365,7 @@ public class WmsProductOutstockServiceImpl implements IWmsProductOutstockService WmsBaseWarehouse warehouse = wmsBaseWarehouseMapper.selectWmsBaseWarehouseByWarehouseId(warehouseId); String outRequirement = warehouse.getOutRequirement(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); Long productOutstockId = null; //如果是直接出库 @@ -377,6 +377,8 @@ public class WmsProductOutstockServiceImpl implements IWmsProductOutstockService wmsProductOutstock.setOutstockType(WmsConstants.WMS_PRODUCT_OUTSTOCK_TYPE_SALE); wmsProductOutstock.setAuditStatus(WmsConstants.WMS_AUDIT_STATUS_PASS); wmsProductOutstock.setExecuteStatus(WmsConstants.WMS_EXECUTE_STATUS_FINISH); + wmsProductOutstock.setOutstockQty(BigDecimal.ONE); + wmsProductOutstock.setApplyQty(BigDecimal.ONE); wmsProductOutstock.setProductId(materialId); wmsProductOutstock.setPlanCode(planCode); wmsProductOutstock.setPlanDetailCode(planDetailCode); @@ -518,7 +520,7 @@ public class WmsProductOutstockServiceImpl implements IWmsProductOutstockService String auditReason = wmsProductOutstockAuditVo.getAuditReason(); Long productOutstockId = wmsProductOutstockAuditVo.getProductOutstockId(); Date currentDate = new Date(); - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); // WmsProductOutstock queryProductOutstock = new WmsProductOutstock(); // queryProductOutstock.setTaskCode(taskCode); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsStockTotalServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsStockTotalServiceImpl.java index 19a3d718..6777cc92 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsStockTotalServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsStockTotalServiceImpl.java @@ -344,7 +344,7 @@ public class WmsStockTotalServiceImpl implements IWmsStockTotalService { wmsRawStock.setSaleOrderId(saleOrderId); wmsRawStock.setSaleorderCode(saleorderCode); wmsRawStock.setUpdateDate(new Date()); - wmsRawStock.setUpdateBy(SecurityUtils.getUsername()); + wmsRawStock.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); wmsRawStockMapper.updateWmsRawStock(wmsRawStock); return mesBaseBarcodeInfo; @@ -492,7 +492,7 @@ public class WmsStockTotalServiceImpl implements IWmsStockTotalService { wmsProductStock.setSaleOrderId(saleOrderId); wmsProductStock.setSaleorderCode(saleorderCode == null ? "" : saleorderCode); wmsProductStock.setUpdateDate(new Date()); - wmsProductStock.setUpdateBy(SecurityUtils.getUsername()); + wmsProductStock.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname()); wmsProductStockMapper.updateWmsProductStock(wmsProductStock); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsTransferServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsTransferServiceImpl.java index f36927c5..3c0e95a6 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsTransferServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsTransferServiceImpl.java @@ -164,7 +164,7 @@ public class WmsTransferServiceImpl implements IWmsTransferService { */ @Override public int applyTransfers(List wmsTransfers) { - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); //todo:生成任务编号 //需要在循环内执行事务，不能用this调用，需要新建一个Service @@ -196,7 +196,7 @@ public class WmsTransferServiceImpl implements IWmsTransferService { @Transactional(rollbackFor = Exception.class) @Override public int transferOutstock(WmsTransferDetail wmsTransferDetail) { - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); String oriLocationCode = wmsTransferDetail.getLocationCode(); @@ -294,7 +294,7 @@ public class WmsTransferServiceImpl implements IWmsTransferService { @Transactional(rollbackFor = Exception.class) @Override public int transferInstock(WmsTransferDetail wmsTransferDetail) { - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getNickname(); Date currentDate = new Date(); String targetLocationCode = wmsTransferDetail.getLocationCode(); String materialBarcode = wmsTransferDetail.getMaterialBarcode();//成品条码（之前半成品出库的是原材料条码） diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsLocationBarcodeMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsLocationBarcodeMapper.xml index 43f6cc95..5eb4e596 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsLocationBarcodeMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsLocationBarcodeMapper.xml @@ -15,6 +15,7 @@ + @@ -101,8 +102,9 @@ select wst.stock_total_id, wst.warehouse_id, wst.warehouse_floor, wst.stock_type, wst.material_id, wst.total_amount, wst.frozen_amount, wst.occupy_amount,wst.safe_flag,wst.sale_order_id, - mbmi.material_code,mbmi.material_name,mbmi.material_spec, - (select sum(wro.real_outstock_amount) from wms_raw_outstock wro where wro.stock_total_id=wst.stock_total_id - and (wro.execute_status='0' or wro.execute_status='1')) outstock_amount + mbmi.material_code,mbmi.material_name,mbmi.material_spec from wms_stock_total wst left join mes_base_material_info mbmi on wst.material_id = mbmi.material_id diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue index e20149a7..f0d1ac48 100644 --- a/hw-ui/src/views/board/fourthFloor/laserLight.vue +++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue @@ -324,7 +324,7 @@ diff --git a/hw-ui/src/views/mes/materialBom/index.vue b/hw-ui/src/views/mes/materialBom/index.vue index b2b7af64..b755f9a2 100644 --- a/hw-ui/src/views/mes/materialBom/index.vue +++ b/hw-ui/src/views/mes/materialBom/index.vue @@ -125,6 +125,8 @@ + + - + +