diff --git a/sgzb-auth/pom.xml b/sgzb-auth/pom.xml index a00e0fcb..762a1791 100644 --- a/sgzb-auth/pom.xml +++ b/sgzb-auth/pom.xml @@ -56,6 +56,13 @@ lombok + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + 3.0.2 + + diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java index 45b54793..a8804d79 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.auth; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -14,6 +15,7 @@ import org.springframework.context.annotation.ComponentScan; */ @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@EnableEncryptableProperties public class SgzbAuthApplication { public static void main(String[] args) { SpringApplication.run(SgzbAuthApplication.class, args); diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java index 203e01a8..e667889c 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java @@ -158,4 +158,13 @@ public class Constants /** 调试分公司*/ public static final String TS = "调试分公司"; + /** 退库任务*/ + public static final int BACK_TASK_TYPE = 36; //退料核查中 + + /** 退库状态 - 退料已提交*/ + public static final String BACK_SUBMIT_STATUS = "38"; //退料已提交 + + /** 退库状态 - 退料核查中*/ + public static final String BACK_CHECKING_STATUS = "39"; //退料核查中 + } diff --git a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java index 1a944116..32b6f5d7 100644 --- a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java +++ b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java @@ -25,11 +25,9 @@ public class SgzbGatewayApplication implements CommandLineRunner { private StringEncryptor encryptor; @Override public void run(String... args) throws Exception { - String nacos = encrypt("Jjsp@nacos2023" ); String mysqlNm = encrypt("root" ); String mysqlPs = encrypt("Bonus@admin123!" ); String redis = encrypt("Dszbns@Redis123!" ); - System.err.println( "nacos原始明文密码加密后的结果为：" + nacos ); System.err.println( "mysqlNm原始明文密码加密后的结果为：" + mysqlNm ); System.err.println( "mysqlPs原始明文密码加密后的结果为：" + mysqlPs ); System.err.println( "redis原始明文密码加密后的结果为：" + redis ); diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml index cf070652..532b2d02 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -25,8 +25,6 @@ spring: nacos: enabled: true nacos: - username: nacos - password: ENC(gQ6+/ZE1DwP8W8IFKQDEllLgAJIOIZ5CBy334W5W/uCdyCrNosOWVuCzIPsm/ZF9) discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 125729b7..12762cc7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -118,22 +118,22 @@ public class BackReceiveController extends BaseController { @Log(title = "退料接收明细-web", businessType = BusinessType.QUERY) @PostMapping("/getReceiveViewWebNum") public AjaxResult getReceiveViewWebNum(@RequestBody BackApplyInfo record) { - int res = 0; + boolean allowBack = true; String[] split = record.getTypeId().split(","); for (String s : split) { record.setModelId(s); record.setTypeId(null); List list = backReceiveService.receiveView(record); for (BackApplyInfo backApplyInfo : list) { - if (Double.valueOf(backApplyInfo.getNum()).intValue() != 0) { - res++; + if (Double.valueOf(backApplyInfo.getNum()).intValue() < 0) { + allowBack = allowBack && false; } } } - if (res > 0) { - return AjaxResult.success(0); - } else { + if (allowBack) { return AjaxResult.success(1); + } else { + return AjaxResult.success(0); } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 316b7229..9b416e81 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -82,6 +82,10 @@ public class BackApplyInfo { * 在用数量 */ private String num; + /** + * 已完成的退料数量 + */ + private String finishedBackNum; /** * 编码 */ @@ -229,4 +233,7 @@ public class BackApplyInfo { * */ private Integer pageSize; + + /**0:未完成退料,可以撤回 1:已完成退料,不能撤回*/ + private Integer isFinished; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index 25d4dadf..fb9655aa 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -270,4 +270,7 @@ public class TmTask implements Serializable { private Integer souceByRefuse; private int souceBy; + /**0:update_time ASC 1:update_time DESC 2:task_status ASC 3:task_status DESC*/ + private int orderStatus; + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 89d6340d..53072fd1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -209,4 +209,6 @@ public interface BackReceiveMapper { List getScrapBackMachine(TmTask task); int updateStatus(BackApplyInfo record); + + int finishBackCheckDetails(BackApplyInfo record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 0007f856..8ac804b6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -99,6 +99,10 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backReceiveMapper.updateStatus(record); } + private int finishBackCheckDetails(BackApplyInfo record) { + return backReceiveMapper.finishBackCheckDetails(record); + } + private int updateTaskStatus(int taskId, int i) { int res; res = backReceiveMapper.updateTaskStatus(taskId, i); @@ -173,8 +177,12 @@ public class BackReceiveServiceImpl implements BackReceiveService { if (StringUtils.isNotBlank(record.getTypeId())) { for (String s : record.getTypeId().split(",")) { record.setTypeId(s); - //修改back_apply_details为已退料（1） - res = updateStatus(record); + if (allZeros) { + //修改back_apply_details为已退料（1） + res = updateStatus(record); + } + //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回 + finishBackCheckDetails(record); List hgList = backReceiveMapper.getHgList(record); if (hgList != null && hgList.size() > 0) { res = insertIad(hgList); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index c1e46b19..d877a16c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -538,6 +538,7 @@ public class TmTaskServiceImpl implements TmTaskService { List tmTaskList; if (roles.contains(STRING_ADMIN)) { tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); +// System.out.println(record.getTypeId()); } else if (deptId != null) { record.setCompanyId(deptId.intValue()); tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record); @@ -1572,4 +1573,4 @@ public class TmTaskServiceImpl implements TmTaskService { public LeaseApplyInfo getListSomeol(LeaseApplyInfo info) { return tmTaskMapper.getListSomeol(info); } -} \ No newline at end of file +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java index c8162bc1..1318134e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java @@ -24,7 +24,7 @@ public class BmUnitInfo { /**单位类型*/ @ApiModelProperty(value = "类型ID") - private long typeId; + private String typeId; /**联系人*/ @Excel(name = "联系人") @ApiModelProperty(value = "联系人") @@ -108,11 +108,11 @@ public class BmUnitInfo { } - public long getTypeId() { + public String getTypeId() { return typeId; } - public void setTypeId(long typeId) { + public void setTypeId(String typeId) { this.typeId = typeId; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java index 4652f1c8..0a8843cd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java @@ -47,6 +47,11 @@ public class BmUnitInfoServiceImpl implements BmUnitInfoService { @Override public AjaxResult unitInfoAdd(BmUnitInfo bmUnitInfo) { BmUnitInfo info = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); +// if (bmUnitInfo.getTypeId().equals("0")){ +// bmUnitInfo.setTypeId("内部单位"); +// }else { +// bmUnitInfo.setTypeId("外部单位"); +// } if (StringUtils.isNotNull(info)) { return AjaxResult.error("新增往来单位名称重复，请重新提交！！！"); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 2bd13d6d..c7455025 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -617,8 +617,11 @@ update back_apply_details set back_status = 1 where parent_id = #{parentId} and type_id = #{typeId} + + update back_check_details set is_finished = 1 where parent_id = #{parentId} and type_id = #{typeId} + - delete from back_check_details where parent_id = #{parentId} and type_id = #{typeId} + delete from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1) and ma_id = #{maId} @@ -713,6 +716,7 @@ bad.status as status, bad.back_status as backStatus, IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num, + bb.finished_back_num, mt.manage_type as manageType, CONCAT('NSJJ',mt.`code`,mt.model_code) as `code` FROM @@ -731,6 +735,16 @@ parent_id=#{id} GROUP BY type_id ) aa on aa.typeId=bad.type_id + LEFT JOIN ( + SELECT + type_id as typeId, + SUM(IFNULL(back_num,0)) as finished_back_num + FROM + back_check_details + WHERE + parent_id=#{id} and is_finished = 1 + GROUP BY type_id + ) bb on bb.typeId=bad.type_id WHERE bai.id=#{id} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 91c0d014..059f1d53 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -480,6 +480,7 @@