zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

生产线物品关系 及 成本价格 修改

master
陈薪名 2 years ago
parent
5123d513f2
commit
5b17da9965
4 changed files with 37 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceBaseVO.java
  2. 21
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java
  3. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java
  4. 30
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceBaseVO.java
View File

@ -21,7 +21,6 @@ public class StdcostpriceBaseVO {
private Long id;
@Schema(description = "供应商代码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "供应商代码不能为空")
private String supplierCode;
@Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED)

21
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.win.module.wms.service.productdismantleRequest;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
@ -14,6 +15,7 @@ import com.win.module.wms.controller.productdismantleRequest.vo.*;
import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaBaseVO;
import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaCreateReqVO;
import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbCreateReqVO;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert;
import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailbConvert;
@ -56,6 +58,7 @@ import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.productionline.ProductionlineService;
import com.win.module.wms.service.recordsetting.RecordsettingService;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.service.shift.ShiftService;
import com.win.module.wms.service.team.TeamService;
import com.win.module.wms.service.transaction.TransactionService;
@ -90,6 +93,8 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*;
@Validated
public class ProductdismantleRequestMainServiceImpl implements ProductdismantleRequestMainService {
@Resource
private RuleService ruleService;
@Resource
private TransactionService transactionService;
@Resource
@ -548,6 +553,22 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR
productdismantleRecordDetailbDO.setCreator(null);
productdismantleRecordDetailbDO.setUpdateTime(null);
productdismantleRecordDetailbDO.setUpdater(null);
// 查询管理精度策略
// RuleRespVO managementtRule = ruleService.management(null, null, productdismantleRequestDetailbDO.getItemCode(), workstationDO.getRawLocationCode(), null, null);
// JSONObject jsonObject = new JSONObject(managementtRule.getConfiguration());
// if(!"TRUE".equals(jsonObject.getStr("ManagementPrecision"))) {
// this.deleteById(balanceDO.getId());
// }
// if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) {
// balanceDOList = balanceService.selectByNumber(itemcode, inventoryStatus, locationcode);
// } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) {
// balanceDOList = balanceService.selectByBatch(itemcode, batch, inventoryStatus, locationcode);
// } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
// balanceDOList = balanceService.selectByPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode);
// } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
// balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus);
// }
detailbDOList.add(productdismantleRecordDetailbDO);
//添加库存事务list
// 入动作

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java
View File

@ -135,7 +135,7 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService
// 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
DataPermissionUtils.executeIgnore(() -> {
validateProductionlineitemExists(id);
validateFgLocationCodeExists(fgLocationCode);
// validateFgLocationCodeExists(fgLocationCode);
validateProductionLineCodeExists(productionLineCode);
validateItemCodeExists(itemCode);
validateAvailableExists(available);

30
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java
View File

@ -106,11 +106,11 @@ public class StdcostpriceServiceImpl implements StdcostpriceService {
} catch (ServiceException ex) {
message.append(ex.getMessage()).append(",");
}
try {
validateSuppercodeExists(stdcostprice.getSupplierCode());
} catch (ServiceException ex) {
message.append(ex.getMessage()).append(",");
}
// try {
// validateSuppercodeExists(stdcostprice.getSupplierCode());
// } catch (ServiceException ex) {
// message.append(ex.getMessage()).append(",");
// }
try {
validateCurrencyExists(stdcostprice.getCurrency());
} catch (ServiceException ex) {
@ -172,7 +172,7 @@ public class StdcostpriceServiceImpl implements StdcostpriceService {
validateStdcostpriceExists(id);
// 校验code唯一
validateCodeExists(id,itemcode,suppercode);
validateSuppercodeExists(suppercode);
// validateSuppercodeExists(suppercode);
validateCurrencyExists(currency);
validatePriceExists(price);
validateAvailableExists(available);
@ -194,9 +194,9 @@ public class StdcostpriceServiceImpl implements StdcostpriceService {
if (itemcode.isEmpty()) {
throw exception(STDCOSTPRICE_ITEN_CODE_NOT_EXISTS);
}
if (suppercode.isEmpty()) {
throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
}
// if (suppercode.isEmpty()) {
// throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
// }
if (StrUtil.isBlank(itemcode)) {
return;
}
@ -216,12 +216,12 @@ public class StdcostpriceServiceImpl implements StdcostpriceService {
}
}
@VisibleForTesting
private void validateSuppercodeExists(String suppercode) {
if (suppercode.isEmpty()) {
throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
}
}
// @VisibleForTesting
// private void validateSuppercodeExists(String suppercode) {
// if (suppercode.isEmpty()) {
// throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
// }
// }
@VisibleForTesting
private void validateCurrencyExists(String currency) {
if (currency.isEmpty()) {

Write Preview
Loading…
Cancel
Save