diff --git a/src/main/java/com/glxp/api/controller/system/CompanyController.java b/src/main/java/com/glxp/api/controller/system/CompanyController.java index 9c069218..0d8e06ea 100644 --- a/src/main/java/com/glxp/api/controller/system/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/system/CompanyController.java @@ -23,7 +23,7 @@ public class CompanyController { @GetMapping("/warehouse/info/company") public BaseResponse getCompanyInfo(CompanyRequest companyRequest) { CompanyEntity companyEntity = companyService.findCompany(companyRequest.getCustomerId()); - if (companyEntity != null) { + if (companyEntity != null) { return ResultVOUtils.success(companyEntity); } return ResultVOUtils.error(500, "企业信息为空"); diff --git a/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java index ffd1bfb3..ba0842b4 100644 --- a/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java @@ -16,4 +16,5 @@ public class InnerOrderEntity { private String remark; private String createUser; private int status; + private String createByName; } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index b444e28a..6a0cc545 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -117,10 +117,10 @@ INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1); INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) -VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1); +VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1); INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`) -VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1); +VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1); CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);