Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

标签数据源数据查询接口参数，逻辑修改，查询配件数量SQL更改

Browse Source
This commit is contained in:
liuzhaotian
2025-04-10 17:13:39 +08:00
parent c12ec28836
commit 58616b1de0
16 changed files with 244 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+5
View File
@@ -343,6 +343,7 @@ public class ErrorCodeConstants {
public static final ErrorCode PART_PACK_DATA_ERROR = new ErrorCode(1_002_041_051, "当前包裹数据为空，无法进行操作，请删除包裹");
public static final ErrorCode PLAN_IS_OPERATOR = new ErrorCode(1_002_041_052, "当前排单正在被用户：{} 操作，无法继续操作");
public static final ErrorCode PLAN_IS_OPERATOR_NOT = new ErrorCode(1_002_041_053, "排单：{} ，正在被用户：{} 操作，无法继续操作");
public static final ErrorCode ORDER_PLAN_DATA_ERROR = new ErrorCode(1_002_041_054, "生产单/排单数据有误，请查看对应的数据");
@@ -415,6 +416,10 @@ public class ErrorCodeConstants {
public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_043_001, "当前组织无资金管理");
public static final ErrorCode INVOICE_NO_EXIST = new ErrorCode(1_002_043_002, "当前发票记录有误，请重新查看");
public static final ErrorCode INVOICING_REJECT_REASON = new ErrorCode(1_002_043_003, "请填写拒绝开票原因");
public static final ErrorCode INVOICE_FILE_IS_NULL = new ErrorCode(1_002_043_004, "发票附件不存在，请重新上传");
public static final ErrorCode INVOICE_FILE_UPLOAD_FAILED = new ErrorCode(1_002_043_005, "发票附件上传失败，请重新上传");
public static final ErrorCode INVOICE_FILE_IS_NULL_NOT_DOWNLOAD = new ErrorCode(1_002_043_006, "发票附件不存在，无法下载");
public static final ErrorCode INVOICE_FILE_DATA_ERROR = new ErrorCode(1_002_043_007, "发票附件下载失败，请重新下载或稍等重试");
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+1 -8
View File
@@ -413,15 +413,8 @@ public class MachineServiceImpl implements MachineService {
// 对机台的配置进行解压
machineDO.setSetting(JsonUtils.unzipString(machineDO.getSetting()));
Long brandId = machineDO.getBrandId();
return MachineConvert.convert(machineDO);
MachineBrandDO machineBrandDO = machineBrandMapper.selectById(brandId);
CuttingRespVO respVO = MachineConvert.convert(machineDO);
respVO.setBrand(machineBrandDO.getBrand());
return respVO;
}