代码备份

dev_no_inv
yewj 9 months ago
parent ffe80daf04
commit f42eaebbb6

@ -45,13 +45,13 @@ public class IoCollectCodeBackupController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<IoCollectCodeResponse> collectOrderCodeManResponses = ioCollectCodeBackService.filterList(IoCollectCodeRequest);
for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses){
for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses) {
if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) {
ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc());
}
IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo());
ioCollectCodeResponse.setBillTime(byBillNo.getBillTime());
if (byBillNo.getRemark() != null){
if (byBillNo.getRemark() != null) {
ioCollectCodeResponse.setRemark(byBillNo.getRemark());
}
}
@ -65,14 +65,15 @@ public class IoCollectCodeBackupController extends BaseController {
/**
* id
*
* @param IoCollectCodeBackup
* @return
*/
@PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/deleteCollectCode")
public BaseResponse deleteCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup) {
boolean b = ioCollectCodeBackService.removeById(IoCollectCodeBackup);
if (!b){
return ResultVOUtils.error(500,"删除失败");
if (!b) {
return ResultVOUtils.error(500, "删除失败");
}
return ResultVOUtils.success("删除成功");
}
@ -80,6 +81,7 @@ public class IoCollectCodeBackupController extends BaseController {
/**
* id
*
* @param IoCollectCodeBackup
* @param bindingResult
* @return
@ -91,8 +93,8 @@ public class IoCollectCodeBackupController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = ioCollectCodeBackService.updateById(IoCollectCodeBackup);
if (!b){
return ResultVOUtils.error(500,"更新失败");
if (!b) {
return ResultVOUtils.error(500, "更新失败");
}
return ResultVOUtils.success("更新成功");
}

@ -6,6 +6,9 @@ import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class CollectOrderBizResponse {

@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://192.168.0.206:3306/udiwms81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 20

Loading…
Cancel
Save