From 9d615d7952e273fd1cecb2594deb6621236a3848 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期日, 11 五月 2025 15:18:47 +0800 Subject: [PATCH] #修改 快速质检功能修改 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 128 ++++++++++++++++++++++---------- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 9 + rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java | 16 +++ rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 45 +++++++---- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 6 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 6 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 24 ++++- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 2 rsf-server/src/main/resources/application-dev.yml | 2 9 files changed, 164 insertions(+), 74 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java index 71510d6..0c8f53a 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java @@ -209,7 +209,7 @@ @ApiOperation("蹇�熻川妫�淇℃伅") @PreAuthorize("hasAuthority('manager:qlyInspect:list')") - @PostMapping("/inspect/query") +// @PostMapping("/inspect/query") public R checkObjs(@RequestBody CheckObjParams params) { if (Objects.isNull(params)) { return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java index bf17cb3..d97176c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java @@ -612,15 +612,15 @@ .setId(isptItem.getId()) .setMatnrCode(isptItem.getMatnrCode()) .setMaktx(isptItem.getMaktx()) - .setDisQty(isptItem.getDisQty()) +// .setDisQty(isptItem.getDisQty()) .setDlyQty(isptItem.getDlyQty()) .setRcptQty(isptItem.getRcptQty()) .setIsptResult(isptItem.getIsptResult()) .setSplrBatch(isptItem.getSplrBatch()) .setSplrName(isptItem.getSplrName()) .setPicPath(isptItem.getPicPath()) - .setMemo(isptItem.getMemo()) - .setSafeQty(isptItem.getSafeQty()); + .setMemo(isptItem.getMemo()); +// .setSafeQty(isptItem.getSafeQty()); dtos.add(objDto); }); return R.ok(dtos); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java index 2aa629f..92bec43 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java @@ -15,15 +15,15 @@ generator.frontendPrefixPath = "rsf-admin/"; generator.sqlOsType = SqlOsType.MYSQL; - generator.url = "127.0.0.1:3306/rsf"; + generator.url = "192.168.4.56:3306/rsf"; generator.username = "root"; generator.password = "34821015"; // generator.url="47.97.1.152:51433;databasename=jkasrs"; // generator.username="sa"; // generator.password="Zoneyung@zy56$"; - generator.table = "man_device_bind"; - generator.tableDesc = "绔嬩綋搴撶珯鐐圭粦瀹�"; + generator.table = "man_qly_inspect_result"; + generator.tableDesc = "璐ㄦ缁撴灉"; generator.packagePath = "com.vincent.rsf.server.manager"; generator.build(); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java index 6e6a8f9..a3cfdec 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java @@ -53,7 +53,7 @@ } @PostMapping("/qlyInspect/reports") - @ApiOperation("鑾峰彇宸蹭笂鎶ュ崟鎹槑缁�") + @ApiOperation("鑾峰彇鍙川妫�鍗曟嵁鏄庣粏") @PreAuthorize("hasAuthority('manager:qlyInspect:list')") public R listByAsnCode(@RequestBody Map<String, Object> map) { if (Objects.isNull(map)) { @@ -132,9 +132,12 @@ if (Objects.isNull(ids) || ids.length < 1) { return R.error("鑳芥暟涓嶈兘涓虹┖锛侊紒"); } - List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>().in(QlyInspect::getId, ids)); + List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>() + .in(QlyInspect::getId, ids) + .gt(QlyInspect::getIsptQty, 0) + ); if (!qlyInspects.isEmpty()) { - return R.error("鏈夋槑缁嗗垪琛ㄥ瓨鍦紒锛�"); + return R.error("鏈夋槑缁嗗崟鎹凡鍦ㄨ川妫�涓紒锛�"); } if (!qlyInspectService.removeByIds(Arrays.asList(ids))) { return R.error("Delete Fail"); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java index bcc3337..9c71c5c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java @@ -10,8 +10,10 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.common.utils.FieldsUtils; import com.vincent.rsf.server.manager.controller.params.IsptItemsParams; import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; +import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.entity.QlyIsptItem; import com.vincent.rsf.server.manager.service.QlyIsptItemService; import com.vincent.rsf.server.system.controller.BaseController; @@ -36,7 +38,19 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<QlyIsptItem, BaseParam> pageParam = new PageParam<>(baseParam, QlyIsptItem.class); - return R.ok().add(qlyIsptItemService.page(pageParam, pageParam.buildWrapper(true))); + + /**鎷兼帴鎵╁睍瀛楁*/ + PageParam<QlyIsptItem, BaseParam> page = qlyIsptItemService.page(pageParam, pageParam.buildWrapper(true)); + List<QlyIsptItem> records = page.getRecords(); + for (QlyIsptItem record : records) { + if (!Objects.isNull(record.getFieldsIndex())) { + Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex()); + record.setExtendFields(fields); + } + } + page.setRecords(records); + + return R.ok(page); } @PreAuthorize("hasAuthority('manager:qlyIsptItem:list')") diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java index f2a782a..2d9c809 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java @@ -1,6 +1,7 @@ package com.vincent.rsf.server.manager.entity; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; + import java.text.SimpleDateFormat; import java.util.Date; @@ -9,12 +10,10 @@ import com.vincent.rsf.server.system.constant.DictTypeCode; import com.vincent.rsf.server.system.entity.DictData; import com.vincent.rsf.server.system.service.DictDataService; +import io.swagger.annotations.Api; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.vincent.rsf.framework.common.Cools; @@ -22,6 +21,7 @@ import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.entity.User; import java.io.Serializable; +import java.util.Map; import java.util.Objects; @Data @@ -84,22 +84,34 @@ @ApiModelProperty(value= "鏀惰揣鏁伴噺") private Double rcptQty; + @ApiModelProperty("璐ㄦ鏁伴噺") + private Double anfme; + /** * 閫佽揣鏁伴噺 */ @ApiModelProperty(value= "閫佽揣鏁伴噺") private Double dlyQty; + @ApiModelProperty("鎵╁睍瀛楁") + private String fieldsIndex; + + @ApiModelProperty("鎵╁睍瀛楁") + @TableField(exist = false) + private Map<String, String> extendFields; + /** * 涓嶅悎鏁伴噺 */ @ApiModelProperty(value= "涓嶅悎鏁伴噺") + @TableField(exist = false) private Double disQty; /** * 鍚堟牸鏁伴噺 */ @ApiModelProperty(value= "鍚堟牸鏁伴噺") + @TableField(exist = false) private Double safeQty; /** @@ -175,8 +187,8 @@ this.stockBatch = stockBatch; this.rcptQty = rcptQty; this.dlyQty = dlyQty; - this.disQty = disQty; - this.safeQty = safeQty; +// this.disQty = disQty; +// this.safeQty = safeQty; this.picPath = picPath; this.status = status; this.deleted = deleted; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java index e5c461b..1ca78d1 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java @@ -8,6 +8,7 @@ import com.vincent.rsf.server.manager.controller.params.IsptOrderParam; import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.*; +import com.vincent.rsf.server.manager.enums.QlyIsptResult; import com.vincent.rsf.server.manager.enums.QlyIsptStatus; import com.vincent.rsf.server.manager.mapper.QlyInspectMapper; import com.vincent.rsf.server.manager.service.*; @@ -37,6 +38,9 @@ @Autowired private QlyIsptItemService qlyIsptItemService; + + @Autowired + private CompanysService companysService; @Autowired private WarehouseAreasItemService warehouseAreasItemService; @@ -105,9 +109,12 @@ String code = params.get("asnCode"); List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService .list(new QueryWrapper<WarehouseAreasItem>() - .select("asn_id as id, SUM(anfme) anfme, SUM(qty) qty, area_id, area_name, asn_code, asn_id") + .select("asn_id as id, SUM(anfme) anfme, SUM(qty) qty, area_id, area_name, asn_code, asn_id, splr_id, splr_batch") .eq(StringUtils.isNotBlank(code), "asn_code", code) .lambda() + .isNull(WarehouseAreasItem::getIsptResult) + .lt(WarehouseAreasItem::getWorkQty, 1) + .lt(WarehouseAreasItem::getQty, 1) .groupBy(WarehouseAreasItem::getAsnCode)); return warehouseAreasItems; } @@ -126,15 +133,18 @@ if (Objects.isNull(param.getIds()) || param.getIds().isEmpty()) { throw new CoolException("鍗曟嵁ID涓嶈兘涓虹┖锛侊紒"); } - List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds()).eq(AsnOrder::getNtyStatus, 0)); + List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds())); if (asnOrders.isEmpty()) { throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); } - List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, param.getIds())); - if (orderItems.isEmpty()) { - throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�"); - } - Map<Long, List<AsnOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId)); +// List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, param.getIds())); +// if (orderItems.isEmpty()) { +// throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�"); +// } + + List<WarehouseAreasItem> orderItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>() + .in(WarehouseAreasItem::getAsnId, param.getIds())); + Map<Long, List<WarehouseAreasItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WarehouseAreasItem::getAsnId)); for (AsnOrder asnOrder : asnOrders) { QlyInspect inspect = new QlyInspect(); String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_INSPECT_CODE, null); @@ -148,23 +158,26 @@ .setAsnId(asnOrder.getId()) .setAsnCode(asnOrder.getCode()); /**鑾峰彇鍗曟嵁鏄庣粏*/ - List<AsnOrderItem> asnOrderItems = listMap.get(asnOrder.getId()); + List<WarehouseAreasItem> asnOrderItems = listMap.get(asnOrder.getId()); if (Objects.isNull(asnOrderItems) || asnOrderItems.isEmpty()) { continue; } - double rcptQty = asnOrderItems.stream().mapToDouble(AsnOrderItem::getQty).sum(); - double anfme = asnOrderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum(); - inspect.setRcptQty(rcptQty).setDlyQty(anfme); + double anfme = asnOrderItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum(); + inspect.setRcptQty(anfme); if (!this.save(inspect)) { throw new CoolException("鍗曟嵁" + asnOrder.getCode() + "淇濆瓨澶辫触锛侊紒"); } List<QlyIsptItem> items = new ArrayList<>(); - for (AsnOrderItem orderItem : asnOrderItems) { + for (WarehouseAreasItem orderItem : asnOrderItems) { QlyIsptItem isptItem = new QlyIsptItem(); BeanUtils.copyProperties(orderItem, isptItem); isptItem.setAsnItemId(orderItem.getId()) .setIspectId(inspect.getId()) - .setRcptQty(orderItem.getQty()) + .setRcptQty(orderItem.getAnfme()) + .setAnfme(0.0) + .setFieldsIndex(orderItem.getFieldsIndex()) + .setSplrBatch(orderItem.getSplrBatch()) + .setSplrName(orderItem.getSplrId$()) .setCreateBy(loginUserId) .setDlyQty(orderItem.getAnfme()); items.add(isptItem); @@ -173,9 +186,9 @@ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); } } - if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds()).set(AsnOrder::getNtyStatus, 1))) { - throw new CoolException("鎶ユ鐘舵�佷慨鏀瑰け璐ワ紒锛�"); - } +// if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds()))) { +// throw new CoolException("鎶ユ鐘舵�佷慨鏀瑰け璐ワ紒锛�"); +// } return R.ok("淇濆瓨鎴愬姛锛侊紒"); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java index 04257e1..287576c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java @@ -8,18 +8,22 @@ import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.entity.QlyInspect; +import com.vincent.rsf.server.manager.entity.QlyInspectResult; import com.vincent.rsf.server.manager.enums.QlyIsptResult; import com.vincent.rsf.server.manager.enums.QlyIsptStatus; import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper; import com.vincent.rsf.server.manager.entity.QlyIsptItem; import com.vincent.rsf.server.manager.service.AsnOrderItemService; +import com.vincent.rsf.server.manager.service.QlyInspectResultService; import com.vincent.rsf.server.manager.service.QlyInspectService; import com.vincent.rsf.server.manager.service.QlyIsptItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Objects; @@ -33,11 +37,14 @@ @Autowired private AsnOrderItemService asnOrderItemService; + @Autowired + private QlyInspectResultService qlyInspectResultService; + /** - * @author Ryan - * @description 鎵归噺淇敼 * @param * @return + * @author Ryan + * @description 鎵归噺淇敼 * @time 2025/4/1 09:40 */ @Override @@ -46,23 +53,67 @@ if (Objects.isNull(params.getIsptItem()) || params.getIsptItem().isEmpty()) { throw new CoolException("ID涓嶈兘涓虹┖锛侊紒"); } - List<QlyIsptItem> isptItem = params.getIsptItem(); + List<QlyIsptItem> isptItem = params.getIsptItem(); List<Long> list = isptItem.stream().map(QlyIsptItem::getId).collect(Collectors.toList()); + + List<QlyIsptItem> isptItems = this.list(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getId, list)); + if (isptItems.isEmpty()) { + throw new CoolException("鏁版嵁閿欒锛氭槑缁嗕笉瀛樺湪锛侊紒"); + } + + for (QlyIsptItem item : isptItems) { + List<QlyInspectResult> results = qlyInspectResultService.list(new LambdaQueryWrapper<QlyInspectResult>() + .eq(QlyInspectResult::getIsptId, item.getIspectId()) + .eq(QlyInspectResult::getIsptItemId, item.getId())); + if (!results.isEmpty()) { + //涓嶄负绌哄仛鏇存柊鎿嶄綔 + + + } else { + //涓虹┖鍋氭柊澧炴搷浣� + QlyInspectResult result = new QlyInspectResult(); + result.setIsptId(item.getIspectId()) + .setAnfme(item.getSafeQty()) + .setIsptItemId(item.getId()); + if (item.getDisQty().compareTo(0.00) < 1) { + continue; + } + result.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val); + result.setAnfme(item.getDisQty()); + + if (!qlyInspectResultService.save(result)) { + throw new CoolException("璐ㄦ缁撹淇濆瓨澶辫触锛侊紒"); + } + + if (item.getSafeQty().compareTo(0.00) < 1) { + continue; + } + result.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val) + .setAnfme(item.getSafeQty()); + + if (!qlyInspectResultService.save(result)) { + throw new CoolException("璐ㄦ缁撹淇濆瓨澶辫触锛侊紒"); + } + } + + } + + if (Short.parseShort(params.getType()) == QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val || Short.parseShort(params.getType()) == QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val) { //1锛氬悎鏍硷紝 2锛氫笉鍚堟牸, 0: 鍏跺畠锛堥粯璁わ級 isptItem.forEach(item -> { if (Short.parseShort(params.getType()) == QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val) { //TODO 鍏堟崱鍚庢敹涓洪�佽揣鏁伴噺锛屽厛鏀跺悗鎹′负鏀惰揣鏁伴噺 - item.setSafeQty(item.getDlyQty()); - item.setDisQty(0.0); +// item.setSafeQty(item.getDlyQty()); +// item.setDisQty(0.0); } else { - item.setSafeQty(0.0); - item.setDisQty(item.getDlyQty()); +// item.setSafeQty(0.0); +// item.setDisQty(item.getDlyQty()); } if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>() - .set(QlyIsptItem::getSafeQty, item.getSafeQty()) +// .set(QlyIsptItem::getSafeQty, item.getSafeQty()) .set(QlyIsptItem::getIsptResult, Short.parseShort(params.getType())) - .set(QlyIsptItem::getDisQty, item.getDisQty()) +// .set(QlyIsptItem::getDisQty, item.getDisQty()) .in(QlyIsptItem::getId, item.getId()))) { throw new CoolException("淇敼澶辫触锛侊紒"); } @@ -72,48 +123,45 @@ throw new CoolException("鏄庣粏淇敼澶辫触"); } } - List<QlyIsptItem> isptItems = this.list(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getId, list)); - if (isptItems.isEmpty()) { - throw new CoolException("鏁版嵁閿欒锛氭槑缁嗕笉瀛樺湪锛侊紒"); - } + Map<Long, List<QlyIsptItem>> listMap = isptItems.stream().collect(Collectors.groupingBy(QlyIsptItem::getIspectId)); for (Long key : listMap.keySet()) { QlyInspect inspect = qlyInspectService.getById(key); List<QlyIsptItem> items = listMap.get(key); items.forEach(qlyIsptItem -> { AsnOrderItem orderItem = asnOrderItemService.getById(qlyIsptItem.getAsnItemId()); - if (qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) >= 0.00) { - orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val) - .setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); - } else if (qlyIsptItem.getSafeQty().compareTo(0.00) > 0.00 && qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) < 0.00) { - orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val); - if (Double.compare(qlyIsptItem.getSafeQty() + qlyIsptItem.getDisQty(), orderItem.getAnfme()) >= 0.00 ) { - orderItem.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); - } else { - orderItem.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_ING.val); - } - } else { - orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val) - .setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); - } +// if (qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) >= 0.00) { +// orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val) +// .setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); +// } else if (qlyIsptItem.getSafeQty().compareTo(0.00) > 0.00 && qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) < 0.00) { +// orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val); +// if (Double.compare(qlyIsptItem.getSafeQty() + qlyIsptItem.getDisQty(), orderItem.getAnfme()) >= 0.00 ) { +// orderItem.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); +// } else { +// orderItem.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_ING.val); +// } +// } else { +// orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val) +// .setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); +// } if (!asnOrderItemService.updateById(orderItem)) { throw new CoolException("鏀惰揣鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�"); } }); - Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum(); - Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum(); - Double qlyQty = safeQty + disQty; - //瀹夊叏鏁伴噺锛岃川妫�鏁伴噺 - inspect.setSafeQty(safeQty) - .setIsptQty(qlyQty); - if (Double.compare(disQty, 0) > 0) { - inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val); - } - if (Double.compare(safeQty, inspect.getDlyQty()) == 0) { -// inspect.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); - inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val); - } +// Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum(); +// Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum(); +// Double qlyQty = safeQty + disQty; +// //瀹夊叏鏁伴噺锛岃川妫�鏁伴噺 +// inspect.setSafeQty(safeQty) +// .setIsptQty(qlyQty); +// if (Double.compare(disQty, 0) > 0) { +// inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val); +// } +// if (Double.compare(safeQty, inspect.getDlyQty()) == 0) { +//// inspect.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val); +// inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val); +// } if (!qlyInspectService.updateById(inspect)) { throw new CoolException("璐ㄦ鏁伴噺淇敼澶辫触锛侊紒"); } diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml index efd3d05..279bc21 100644 --- a/rsf-server/src/main/resources/application-dev.yml +++ b/rsf-server/src/main/resources/application-dev.yml @@ -14,7 +14,7 @@ driver-class-name: com.mysql.jdbc.Driver # url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root - url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.4.56:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: rsf password: 34821015 type: com.alibaba.druid.pool.DruidDataSource -- Gitblit v1.9.1