From 772ce1ff99b32e0d8c5ee1135f8a9fb03eb9fc60 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 14:51:13 +0800
Subject: [PATCH] 添加校验
---
inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java | 2
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 4
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 2
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java | 1
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 1
inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java | 2
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java | 78 +++++++++---------
/dev/null | 20 -----
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 10 ++
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java | 11 ++
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 6 +
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 32 ++++---
inventory-server/src/main/resources/mapper/SaleMapper.xml | 27 +++---
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java | 2
15 files changed, 106 insertions(+), 94 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
index 54eb966..af1bd3e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -111,6 +111,7 @@
}
//濡傛灉妫�楠屽悎鏍�,闇�瑕佹柊澧炴垚鍝�(0)搴撳瓨
if (result == 1) {
+ /*鏂板鎴愬搧(0)搴撳瓨*/
//濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Repertory::getOrderCode, finishedInspect.getOrderNumber())
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 74e77d6..b02f98c 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
<select id="selectUnRawInspectsList" resultType="java.util.Map">
- select ru.id
+ select ru.id,
DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
code,
@@ -32,7 +32,7 @@
order by ru.id desc
</select>
<select id="selectInsList" resultType="java.util.Map">
- select ru.id
+ select ru.id,
DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
material_code,
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
index 3e80933..fef686e 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.dto.ConsignmentDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -17,6 +20,7 @@
import com.yuanchu.mom.service.ConsignmentService;
import javax.annotation.Resource;
+import java.sql.Wrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,6 +51,11 @@
})
@GetMapping("/selSale")
public Result selSale(String orderNumber) {
+ //鍙湁閿�鍞崟瀹℃牳閫氳繃涔嬪悗鎵嶈兘鍙戣揣
+ Sale sale = saleService.getOne(Wrappers.<Sale>query().eq("order_number", orderNumber));
+ if (ObjectUtils.isEmpty(sale.getType()) || sale.getType() != 1 ) {
+ return Result.fail("鍙湁閿�鍞崟瀹℃牳閫氳繃涔嬪悗鎵嶈兘鍙戣揣!");
+ }
return Result.success(saleService.selSale(orderNumber));
}
@@ -74,6 +83,7 @@
map.put("row", consignmentPage.getRecords());
return Result.success(map);
}
+
@ApiOperation(value = "鏍规嵁鍙戣揣id鍒犻櫎")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鍙戣揣id", dataTypeClass = Integer.class, required = true)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
index 6a77b84..17b04a8 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
@@ -38,7 +38,7 @@
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "orderCode", value = "璁㈠崟缂栧彿", dataTypeClass = String.class),
@ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "state", value = "缂栧埗鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "state", value = "缂栧埗鐘舵��(涓虹┖=寰呯紪鍒�0+宸茬紪鍒�1)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "time", value = "涓嬪崟鏃堕棿", dataTypeClass = String.class)
})
@GetMapping("/selectAllOrder")
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index 0505b8c..7108114 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -59,7 +59,7 @@
return Result.success(map);
}
- @ApiOperation(value = "鏂板閿�鍞崟-->娣诲姞浜у搧-->鏌ヨ鎴愬搧搴撳瓨")
+ @ApiOperation(value = "鏂板閿�鍞崟-->娣诲姞浜у搧-->鏌ヨ鎴愬搧搴撳瓨宸叉楠岀殑浜у搧")
@PostMapping("/seleRepe")
public Result seleRepe() {
return Result.success(repertoryService.getSale());
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java
deleted file mode 100644
index db364f7..0000000
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.mom.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 閿�鍞骇鍝佸崟 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-08
- */
-@RestController
-@RequestMapping("/sale-material")
-public class SaleMaterialController {
-
-}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
index 39192dd..37f3635 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
@@ -90,7 +90,7 @@
@ApiModelProperty(value = "鐘舵�� 0:涓嶉�氳繃;1:閫氳繃")
private Integer type;
- @ApiModelProperty(value = "缂栧埗鐘舵��0:寰呯紪鍒�;1宸茬紪鍒� 閫氳繃灏辨槸宸茬紪鍒�,娌℃湁鐘舵�佸氨鏄緟缂栧埗")
+ @ApiModelProperty(value = "缂栧埗鐘舵��0:寰呯紪鍒�;1宸茬紪鍒�;2:鏃犵紪鍒� 閫氳繃灏辨槸宸茬紪鍒�,涓嶉�氳繃灏辨槸鏃犵紪鍒�")
private Integer bianzhiState;
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
index 7e6bd4e..5b7df7f 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
@@ -14,7 +14,7 @@
@JsonSerialize
private String orderCode;
- //鍚堝悓缂栧彿
+ //鍚堝悓缂栧彿(瀹㈡埛璁㈠崟鍙�)
@JsonSerialize
private String customerCode;
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java
index 823535f..81fde89 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java
@@ -4,6 +4,7 @@
import lombok.Data;
@Data
+//鏂板鎴愬搧鍏ュ簱
public class ImportRepertoryDto {
/**
* 璁㈠崟缂栫爜
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
index f0e4955..a32085e 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
@@ -5,6 +5,7 @@
import com.yuanchu.mom.pojo.SaleMaterial;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -15,42 +16,52 @@
public class SaleDto {
//璁㈠崟缂栧彿
+ @NotBlank(message = "璁㈠崟缂栧彿涓嶈兘涓虹┖")
@JsonSerialize
private String orderNumber;
//宸ョ▼鍚嶇О
+ @NotBlank(message = "宸ョ▼鍚嶇О涓嶈兘涓虹┖")
@JsonSerialize
private String name;
//鍚堝悓缂栧彿
+ @NotBlank(message = "鍚堝悓缂栧彿涓嶈兘涓虹┖")
@JsonSerialize
private String code;
//瀹㈡埛鍚嶇О
+ @NotBlank(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖")
@JsonSerialize
private String proname;
//鏀惰揣鍦板潃
+ @NotBlank(message = "鏀惰揣鍦板潃涓嶈兘涓虹┖")
@JsonSerialize
private String adress;
//鑱旂郴浜�
+ @NotBlank(message = "鑱旂郴浜轰笉鑳戒负绌�")
@JsonSerialize
private String username;
//鑱旂郴鐢佃瘽
+ @NotBlank(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖")
@JsonSerialize
private String phone;
//涓嬪崟浜�
@JsonSerialize
+ @NotBlank(message = "涓嬪崟浜轰笉鑳戒负绌�")
private String orderName;
//浜よ揣鏃ユ湡
+ @NotBlank(message = "浜よ揣鏃ユ湡涓嶈兘涓虹┖")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date delTime;
//浜у搧淇℃伅
+ @NotBlank(message = "浜у搧淇℃伅涓嶈兘涓虹┖")
@JsonSerialize
private List<SaleMaterialDto> saleMaterialList;
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
index adbb905..c1c3a7e 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
@@ -21,6 +21,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鎴愬搧鍙戣揣琛�(Consignment)琛ㄦ湇鍔″疄鐜扮被
@@ -45,25 +46,22 @@
public String addCon(String name, ConsignmentDto consignmentDto) {
//鐢熸垚涓�涓娂杩愬崟缂栧彿
String escortCode = MyUtil.getTimeSixNumberCode("YY");
- //濡傛灉璇ヨ鍗曞凡缁忓彂杩囪揣浜嗕笉鑳藉啀鍙戣揣
List<Consignment> consignments = consignmentMapper.selectAll();
- //濡傛灉娌℃湁鍙戣揣琛ㄤ腑娌℃湁鏁版嵁涔熷彲浠ュ彂璐�
- if (consignments.size()==0) {
+ //濡傛灉鍙戣揣琛ㄤ腑娌℃湁鏁版嵁涔熷彲浠ュ彂璐�
+ if (consignments.size() == 0) {
/*鏂板鎴愬搧鍙戣揣*/
- String mes1 = addConsign(name, consignmentDto, escortCode);
- return mes1;
- } else {
- for (Consignment consignment : consignments) {
- if (consignment.getCustomerCode().equals(consignmentDto.getCustomerCode())) {
- return "璇ュ悎鍚岃鍗曞凡鍙戣繃璐�,鏃犳硶鍐嶆鍙戣揣!";
- } else {
- /*鏂板鎴愬搧鍙戣揣*/
- String mes2 = addConsign(name, consignmentDto, escortCode);
- return mes2;
- }
- }
+ return addConsign(name, consignmentDto, escortCode);
}
- return null;
+ //鑾峰彇鍙戣揣琛ㄤ腑鐨勫悎鍚岀紪鍙烽泦鍚�
+ List<String> customerCodeList = consignments.stream().map(consignment -> {
+ String customerCode = consignment.getCustomerCode();
+ return customerCode;
+ }).distinct().collect(Collectors.toList());
+ if (customerCodeList.contains(consignmentDto.getCustomerCode())) {
+ return "璇ュ悎鍚岃鍗曞凡鍙戣繃璐�,鏃犳硶鍐嶆鍙戣揣!";
+ }
+ /*鏂板鎴愬搧鍙戣揣*/
+ return addConsign(name, consignmentDto, escortCode);
}
//鏌ヨ鍙戣揣璁板綍鍒楄〃
@@ -128,29 +126,31 @@
.eq(Repertory::getType, 0);
Repertory repertory = repertoryMapper.selectOne(queryWrapper);
//璇ユ垚鍝佺殑妫�楠岀姸鎬佹槸宸叉楠�1鎵嶈兘杩涜鍙戣揣
- if (repertory.getCheckState() == 1) {
- //璇ユ垚鍝佸簱瀛樼殑鏁伴噺澶т簬绛変簬鍙戣揣鐨勬暟閲忔墠鑳借繘琛屽彂璐�
- if (repertory.getNumber() >= message.getNumber()) {
- //鏋勯�犳垚鍝佸彂璐у疄浣撶被
- Consignment consig = Consignment.builder()
- .customerCode(consignmentDto.getCustomerCode())
- .escortCode(escortCode)
- .orderCode(consignmentDto.getOrderCode())
- .userName(name)
- .checkName(consignmentDto.getCheckName())
- .fitName(consignmentDto.getFitName())
- .name(message.getName())
- .specifications(message.getSpecifications())
- .unit(message.getUnit())
- .number(message.getNumber())
- .code(repertory.getCode())
- .build();
- consignmentMapper.insert(consig);
- /*鍑忓皯瀵瑰簲鐨勫簱瀛�*/
- repertory.setNumber(repertory.getNumber() - consig.getNumber());
- repertoryMapper.updateById(repertory);
- } else return "搴撳瓨涓嶈冻,鏃犳硶鍙戣揣!";
- } else return "璇ヤ骇鍝佽繕鏈楠�,涓嶈兘鍙戣揣!";
+ if (repertory.getCheckState() != 1) {
+ return "璇ヤ骇鍝佽繕鏈楠�,涓嶈兘鍙戣揣!";
+ }
+ //璇ユ垚鍝佸簱瀛樼殑鏁伴噺澶т簬绛変簬鍙戣揣鐨勬暟閲忔墠鑳借繘琛屽彂璐�
+ if (repertory.getNumber() < message.getNumber()) {
+ return "搴撳瓨涓嶈冻,鏃犳硶鍙戣揣!";
+ }
+ //鏋勯�犳垚鍝佸彂璐у疄浣撶被
+ Consignment consig = Consignment.builder()
+ .customerCode(consignmentDto.getCustomerCode())
+ .escortCode(escortCode)
+ .orderCode(consignmentDto.getOrderCode())
+ .userName(name)
+ .checkName(consignmentDto.getCheckName())
+ .fitName(consignmentDto.getFitName())
+ .name(message.getName())
+ .specifications(message.getSpecifications())
+ .unit(message.getUnit())
+ .number(message.getNumber())
+ .code(repertory.getCode())
+ .build();
+ consignmentMapper.insert(consig);
+ /*鍑忓皯瀵瑰簲鐨勫簱瀛�*/
+ repertory.setNumber(repertory.getNumber() - consig.getNumber());
+ repertoryMapper.updateById(repertory);
}
/*鍙戣揣鎴愬姛涔嬪悗闇�瑕佹柊澧炰竴寮犲洖鍗�*/
Receipt receipt = new Receipt();
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
index 7e732b4..c1898ba 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
@@ -42,7 +42,7 @@
BeanUtils.copyProperties(importRepertoryDto, importRepertory);
importRepertory.setUserName(name);
importRepertoryMapper.insert(importRepertory);
- //鏂板鎴愬搧搴撳瓨
+ /*鏂板鎴愬搧搴撳瓨(鏈楠�)*/
//濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Repertory::getOrderCode, importRepertoryDto.getOrderCode())
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index bffc773..8b1ebbf 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -43,21 +43,21 @@
//鏌ヨ閿�鍞崟鍒楄〃
@Override
public IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime) {
- return saleMapper.selectSaleList(page,orderNumber,name,type,delTime);
+ return saleMapper.selectSaleList(page, orderNumber, name, type, delTime);
}
//鏂板閿�鍞崟
@Override
- public String addSale(String saleman,SaleDto saleDto) {
+ public String addSale(String saleman, SaleDto saleDto) {
Sale sale = new Sale();
- BeanUtils.copyProperties(saleDto,sale);
+ BeanUtils.copyProperties(saleDto, sale);
sale.setSaleman(saleman);
saleMapper.insert(sale);
//娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
for (SaleMaterialDto saleMaterialDto : saleMaterialDtoList) {
SaleMaterial saleMaterial = new SaleMaterial();
- BeanUtils.copyProperties(saleMaterialDto,saleMaterial);
+ BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
saleMaterial.setSaleId(sale.getId());
saleMaterialMapper.insert(saleMaterial);
}
@@ -69,7 +69,7 @@
public SaleVo selectSaleDatil(Integer id) {
SaleVo saleVo = new SaleVo();
Sale sale = saleMapper.selectById(id);
- BeanUtils.copyProperties(sale,saleVo);
+ BeanUtils.copyProperties(sale, saleVo);
List<SaleMaterial> saleMaterialList = saleMaterialMapper.selectSaleDatil(id);//閿�鍞崟id
List<SaleMaterialDto> saleMaterialDtoList = saleMaterialList.stream().map(saleMaterial -> {
SaleMaterialDto saleMaterialDto = new SaleMaterialDto();
@@ -113,14 +113,14 @@
public void updateSaleById(String saleman, Integer id, SaleVo saleVo) {
Sale sale = saleMapper.selectById(id);
sale.setSaleman(saleman);
- BeanUtils.copyProperties(saleVo,sale);
+ BeanUtils.copyProperties(saleVo, sale);
//鏇存柊閿�鍞崟
saleMapper.updateById(sale);
List<SaleMaterial> saleMaterials = saleMaterialMapper.selectSaleDatil(id);
for (SaleMaterial saleMaterial : saleMaterials) {
List<SaleMaterialDto> saleMaterialDtos = saleVo.getSaleMaterialList();
for (SaleMaterialDto saleMaterialDto : saleMaterialDtos) {
- BeanUtils.copyProperties(saleMaterialDto,saleMaterial);
+ BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
//鏇存柊閿�鍞骇鍝佸崟
saleMaterialMapper.updateById(saleMaterial);
}
@@ -129,17 +129,17 @@
//瀹℃牳
@Override
- public void check(String checkname,Integer id,Integer type) {
+ public void check(String checkname, Integer id, Integer type) {
Sale sale = saleMapper.selectById(id);
sale.setType(type);
sale.setCheckname(checkname);
sale.setCheckTime(new Date());
- if (type==1) {
+ if (type == 1) {
//濡傛灉瀹℃牳閫氳繃
sale.setBianzhiState(1);
- }else {
+ } else {
//濡傛灉瀹℃牳涓嶉�氳繃
- sale.setBianzhiState(null);
+ sale.setBianzhiState(2);//鏃犵紪鍒�
}
saleMapper.updateById(sale);
}
@@ -147,8 +147,14 @@
//鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
@Override
public ConsignmentDto1 selSale(String orderNumber) {
- Sale sale = saleMapper.selectOne(Wrappers.<Sale>query().eq("order_number", orderNumber));
- List<SaleMaterial> saleMaterials = saleMaterialMapper.selectList(Wrappers.<SaleMaterial>query().eq("sale_id", sale.getId()));
+ Sale sale = saleMapper.selectOne(Wrappers.<Sale>query()
+ .eq("order_number", orderNumber)
+ .eq("type", 1)
+ .eq("state", 1));
+ //鏌ヨ閿�鍞崟涓骇鍝佷俊鎭�
+ List<SaleMaterial> saleMaterials = saleMaterialMapper.selectList(Wrappers.<SaleMaterial>query()
+ .eq("sale_id", sale.getId())
+ .eq("state", 1));
List<ConsignmentDto2> dto2List = saleMaterials.stream().map(saleMaterial -> {
ConsignmentDto2 consignmentDto2 = new ConsignmentDto2();
BeanUtils.copyProperties(saleMaterial, consignmentDto2);
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index 11d1608..f6ccf2a 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -22,10 +22,10 @@
<if test="time!=null and time!=''">
and create_time=#{time}
</if>
- <if test="type!=null and type!=''">
+ <if test="type!=null ">
and type=#{type}
</if>
- <if test="checkState!=null and checkState!=''">
+ <if test="checkState!=null ">
and check_state=#{checkState}
</if>
order by id desc
@@ -36,5 +36,7 @@
select id, name, specifications, unit
from mom_ocean.repertory
where state = 1
+ and check_state = 1
+ and type = 0
</select>
</mapper>
\ No newline at end of file
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index ef865df..5d95a13 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -17,7 +17,7 @@
<if test="name!=null and name!=''">
and name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="type!=null and type!=''">
+ <if test="type!=null ">
and type=#{type}
</if>
<if test="delTime!=null and delTime!=''">
@@ -29,26 +29,27 @@
<!--鏌ヨ璁㈠崟BOM鍒楄〃-->
<select id="selectAllOrder" resultType="java.util.Map">
select s.id ,
- order_number,
- saleman,
- proname,
- sm.name,
- specifications,
- unit,
- number,
- DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
- bianzhi_state
- from mom_ocean.sale s ,mom_ocean.sale_material sm
+ order_number,
+ saleman,
+ proname,
+ sm.name,
+ specifications,
+ unit,
+ number,
+ DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ bianzhi_state
+ from mom_ocean.sale s ,mom_ocean.sale_material sm
where s.id=sm.sale_id
and s.state=1
+ and bianzhi_state!=2
<if test="orderCode!=null and orderCode!=''">
and order_number like concat('%',#{orderCode},'%')
</if>
<if test="name!=null and name!=''">
and sm.name like concat('%',#{name},'%')
</if>
- <if test="state!=null and state!=''">
+ <if test="state!=null ">
and bianzhi_state=#{state}
</if>
<if test="time!=null and time!=''">
--
Gitblit v1.9.3