From e8a75a44bdc130e8b162351c3c94c01f3d8ada5e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 八月 2023 17:58:00 +0800
Subject: [PATCH] 入库+发货
---
inventory-server/src/main/java/com/yuanchu/mom/pojo/ImportRepertory.java | 94 ++++
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 12
standard-server/src/main/resources/mapper/OrdersMapper.xml | 12
inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java | 2
sale-server/pom.xml | 6
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java | 120 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 78 +++
inventory-server/pom.xml | 6
inventory-server/src/main/java/com/yuanchu/mom/service/ImportRepertoryService.java | 45 ++
inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml | 26 +
sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java | 10
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java | 82 ++++
inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java | 4
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 19
inventory-server/src/main/java/com/yuanchu/mom/controller/RepertoryController.java | 7
inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java | 24
inventory-server/src/main/resources/mapper/ConsignmentMapper.xml | 7
sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java | 1
sale-server/src/main/resources/mapper/SaleMaterialMapper.xml | 17
inspect-server/pom.xml | 5
sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java | 26 +
inventory-server/src/main/java/com/yuanchu/mom/pojo/Consignment.java | 106 +++++
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java | 49 ++
inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java | 2
sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java | 3
inventory-server/src/main/java/com/yuanchu/mom/mapper/ImportRepertoryMapper.java | 21 +
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java | 53 ++
inventory-server/src/main/java/com/yuanchu/mom/mapper/ConsignmentMapper.java | 19
inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java | 2
standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java | 4
inventory-server/src/main/java/com/yuanchu/mom/service/ConsignmentService.java | 22 +
standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 6
inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java | 10
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 59 ++
inventory-server/src/main/java/com/yuanchu/mom/controller/ImportRepertoryController.java | 97 ++++
standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 20 -
sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 10
sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java | 40 ++
sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java | 1
sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 26 +
sale-server/src/main/resources/mapper/SaleMapper.xml | 13
42 files changed, 1,060 insertions(+), 107 deletions(-)
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index 079191b..c4be448 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -33,6 +33,11 @@
<artifactId>standard-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.yuanchu.mom</groupId>
+ <artifactId>inventory-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>com.vaadin.external.google</groupId>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
index dd7eaba..f64a1f7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.FinishedInspect;
import com.yuanchu.mom.service.*;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -43,6 +45,9 @@
@Autowired
private MaterialService materialService;
+
+ @Autowired
+ Jwt jwt;
@ApiOperation(value = "鏂板鎸夐挳-->1銆佹柊澧炴垚鍝佹楠屽崟")
@PostMapping("/add_process_inspection_sheet")
@@ -84,8 +89,9 @@
@ApiImplicitParam(name = "result",value = "妫�楠岀粨璁�",dataTypeClass = Integer.class,required = true),
})
@PostMapping("/inspection_conclusion")
- public Result<?> inspectionConclusion(Integer finishedInspectId, Integer result){
- Integer isInsertSuccess = finishedInspectService.inspectionConclusion(finishedInspectId, result);
+ public Result<?> inspectionConclusion(@RequestHeader("token") String token,Integer finishedInspectId, Integer result) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ Integer isInsertSuccess = finishedInspectService.inspectionConclusion(data.get("name").replaceAll("\"", ""),finishedInspectId, result);
if (isInsertSuccess == 1){
return Result.success("涓婃姤鎴愬姛锛�");
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
index 9d3f22c..a7a296d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
@@ -21,7 +21,7 @@
@Transactional(rollbackFor = Exception.class)
Integer addProcessInspectionSheet(FinishedInspect finishedInspect);
- Integer inspectionConclusion(Integer finishedInspectId, Integer result);
+ Integer inspectionConclusion(String username,Integer finishedInspectId, Integer result);
IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
}
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 6dca1e1..54eb966 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
@@ -1,18 +1,22 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
+import com.yuanchu.mom.mapper.RepertoryMapper;
import com.yuanchu.mom.pojo.FinishedInspect;
import com.yuanchu.mom.mapper.FinishedInspectMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
+import com.yuanchu.mom.pojo.Repertory;
import com.yuanchu.mom.service.FinishedInspectService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.service.InspectionItemService;
import com.yuanchu.mom.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
@@ -20,7 +24,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -41,11 +45,14 @@
@Resource
InspectUnacceptedMapper inspectUnacceptedMapper;
+ @Resource
+ RepertoryMapper repertoryMapper;
+
@Override
public Integer addProcessInspectionSheet(FinishedInspect finishedInspect) {
finishedInspect.setType(0);
int insert = finishedInspectMapper.insert(finishedInspect);
- if (insert == 1){
+ if (insert == 1) {
List<Map<String, Object>> maps = productService.selectProductList(finishedInspect.getSpecificationsId());
inspectionItemService.insertList(finishedInspect.getId(), maps);
return insert;
@@ -53,22 +60,85 @@
return 0;
}
+
@Override
- public Integer inspectionConclusion(Integer finishedInspectId, Integer result) {
+ @Transactional(rollbackFor = Exception.class)
+ public Integer inspectionConclusion(String username, Integer finishedInspectId, Integer result) {
//鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�
LambdaUpdateWrapper<FinishedInspect> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(FinishedInspect::getId, finishedInspectId);
updateWrapper.set(FinishedInspect::getResult, result);
finishedInspectMapper.update(new FinishedInspect(), updateWrapper);
- //濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟
+ //濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟,杩橀渶瑕佹柊澧炲崐鎴愬搧搴撳瓨
FinishedInspect finishedInspect = finishedInspectMapper.selectById(finishedInspectId);
if (result == 0) {
+ /*鏂板涓嶅悎鏍兼楠屽崟*/
InspectUnaccepted inspectUnaccepted = InspectUnaccepted.builder()
.reason(finishedInspect.getProjectName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄伐绋嬪悕绉颁笉鍚堟牸
.rawInspectId(finishedInspectId)
.type(finishedInspect.getType())
.build();
inspectUnacceptedMapper.insert(inspectUnaccepted);
+ /*鏂板鍗婃垚鍝�(1)搴撳瓨*/
+ //濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
+ LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Repertory::getOrderCode, finishedInspect.getOrderNumber())
+ .eq(Repertory::getCode, finishedInspect.getMaterialCode())
+ .eq(Repertory::getName, finishedInspect.getMaterial())
+ .eq(Repertory::getSpecifications, finishedInspect.getSpecificationsModel())
+ .eq(Repertory::getUnit, finishedInspect.getUnit())
+ .eq(Repertory::getType, 1);
+ Repertory rep = repertoryMapper.selectOne(queryWrapper);
+ if (rep != null && rep.getCheckState()==1) {
+ rep.setNumber(rep.getNumber() + finishedInspect.getQuantity());
+ rep.setUserName(username);
+ repertoryMapper.updateById(rep);
+ } else {
+ //濡傛灉闄や簡搴撳瓨鍒殑淇℃伅鏈変换浣曚竴涓笉涓�鏍�,鍒欐柊澧炰竴鏉″崐鎴愬搧搴撳瓨
+ Repertory repertory = Repertory.builder()
+ .orderCode(finishedInspect.getOrderNumber())
+ .code(finishedInspect.getMaterialCode())
+ .name(finishedInspect.getMaterial())
+ .specifications(finishedInspect.getSpecificationsModel())
+ .unit(finishedInspect.getUnit())
+ .number(finishedInspect.getQuantity())
+ .userName(username)
+ .type(1)
+ .checkState(1)
+ .build();
+ repertoryMapper.insert(repertory);
+ }
+ }
+ //濡傛灉妫�楠屽悎鏍�,闇�瑕佹柊澧炴垚鍝�(0)搴撳瓨
+ if (result == 1) {
+ //濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
+ LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Repertory::getOrderCode, finishedInspect.getOrderNumber())
+ .eq(Repertory::getCode, finishedInspect.getMaterialCode())
+ .eq(Repertory::getName, finishedInspect.getMaterial())
+ .eq(Repertory::getSpecifications, finishedInspect.getSpecificationsModel())
+ .eq(Repertory::getUnit, finishedInspect.getUnit())
+ .eq(Repertory::getType, 0);
+ Repertory rep = repertoryMapper.selectOne(queryWrapper);
+ if (rep != null && rep.getCheckState()==1) {
+ rep.setNumber(rep.getNumber() + finishedInspect.getQuantity());
+ rep.setUserName(username);
+ repertoryMapper.updateById(rep);
+ } else {
+ //濡傛灉闄や簡搴撳瓨鍒殑淇℃伅鏈変换浣曚竴涓笉涓�鏍�,鍒欐柊澧炰竴鏉℃垚鍝佸簱瀛�
+ Repertory repertory = Repertory.builder()
+ .orderCode(finishedInspect.getOrderNumber())
+ .code(finishedInspect.getMaterialCode())
+ .name(finishedInspect.getMaterial())
+ .specifications(finishedInspect.getSpecificationsModel())
+ .unit(finishedInspect.getUnit())
+ .number(finishedInspect.getQuantity())
+ .userName(username)
+ .type(0)
+ .checkState(1)
+ .build();
+ repertoryMapper.insert(repertory);
+ }
}
return 1;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 839e7ae..1d16519 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -161,26 +161,6 @@
rawInsProductService.saveBatch(list);
return rawInspect.getId();
}
-
- //鍒ゆ柇鏁扮粍鏄惁鍖呭惈0
- private static boolean containsZero(Object[] array) {
- for (Object num : array) {
- if (num.equals(0)) {
- return true;
- }
- }
- return false;
- }
-
- //鍒ゆ柇鏁扮粍鏄惁鍏ㄩ儴涓�1
- private static boolean allOnes(Object[] array) {
- for (Object num : array) {
- if (!num.equals(1)) {
- return false;
- }
- }
- return true;
- }
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 6cd8f94..ab3d5c2 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -18,13 +18,13 @@
DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
<where>
- <if test="dealState!=null">
+ <if test="dealState!=null and dealState!=''">
and deal_state=#{dealState}
</if>
- <if test="formTime!=null">
+ <if test="formTime!=null and formTime!=''">
and form_time=#{formTime}
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and ru.type=#{type}
</if>
and ru.state=1
@@ -49,13 +49,13 @@
mom_ocean.user u
where fi.id = ru.raw_inspect_id
and fi.user_id=u.id
- <if test="dealState!=null">
+ <if test="dealState!=null and dealState!=''">
and deal_state=#{dealState}
</if>
- <if test="formTime!=null">
+ <if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and ru.type=#{type}
</if>
and ru.state=1
diff --git a/inventory-server/pom.xml b/inventory-server/pom.xml
index baf1f1d..8f13703 100644
--- a/inventory-server/pom.xml
+++ b/inventory-server/pom.xml
@@ -31,6 +31,12 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.yuanchu.mom</groupId>
+ <artifactId>sale-server</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
<!--宸ュ叿妯″潡-->
<dependency>
<groupId>com.yuanchu.mom</groupId>
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
new file mode 100644
index 0000000..ef0cd6b
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -0,0 +1,59 @@
+package com.yuanchu.mom.controller;
+
+
+
+
+import com.yuanchu.mom.pojo.dto.ConsignmentDto;
+import com.yuanchu.mom.service.SaleService;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.utils.Jwt;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yuanchu.mom.service.ConsignmentService;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 鎴愬搧鍙戣揣琛�(Consignment)琛ㄦ帶鍒跺眰
+ *
+ * @author zss
+ * @since 2023-08-10 15:08:02
+ */
+@Api(tags = "WMS绠＄悊-->鎴愬搧鍙戣揣")
+@RestController
+@RequestMapping("/consignment")
+public class ConsignmentController {
+
+ @Autowired
+ private ConsignmentService consignmentService;
+
+ @Resource
+ SaleService saleService;
+
+ @Resource
+ Jwt jwt;
+
+ @ApiOperation(value = "鏂板鎴愬搧鍙戣揣-->鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "orderNumber", value = "璁㈠崟缂栧彿", dataTypeClass = String.class, required = true)
+ })
+ @GetMapping("/selSale")
+ public Result selSale(String orderNumber ) {
+ return Result.success(saleService.selSale(orderNumber));
+ }
+
+ @ApiOperation(value = "鏂板鎴愬搧鍙戣揣")
+ @PostMapping("/addCon")
+ public Result addCon(@RequestHeader("token") String token, @RequestBody ConsignmentDto consignmentDto) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ return Result.success(consignmentService.addCon(data.get("name").replaceAll("\"", ""), consignmentDto));
+ }
+
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ImportRepertoryController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ImportRepertoryController.java
new file mode 100644
index 0000000..80634e3
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ImportRepertoryController.java
@@ -0,0 +1,97 @@
+package com.yuanchu.mom.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.ImportRepertory;
+import com.yuanchu.mom.pojo.dto.ImportRepertoryDto;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.utils.Jwt;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yuanchu.mom.service.ImportRepertoryService;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 鎴愬搧鍏ュ簱琛�(ImportRepertory)琛ㄦ帶鍒跺眰
+ *
+ * @author zss
+ * @since 2023-08-10 10:27:01
+ */
+@Api(tags = "WMS绠＄悊-->鎴愬搧鍏ュ簱")
+@RestController
+@RequestMapping("/importRepertory")
+public class ImportRepertoryController {
+
+ @Autowired
+ private ImportRepertoryService importRepertoryService;
+
+ @Resource
+ Jwt jwt;
+
+ @ApiOperation(value = "鏂板鎴愬搧鍏ュ簱")
+ @PostMapping("/addImpRep")
+ public Result addSale(@RequestHeader("token") String token, @RequestBody ImportRepertoryDto importRepertoryDto) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ importRepertoryService.addImpRep(data.get("name").replaceAll("\"", ""), importRepertoryDto);
+ return Result.success("鏂板鎴愬姛!");
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夊叆搴撳垪琛�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @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 = "time", value = "鍏ュ簱鏃ユ湡", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAllImpRep")
+ public Result selectAllImpRep(int pageSize, int countSize, String orderCode, String name, String time) {
+ IPage<Map<String, Object>> importRepertoryPage = importRepertoryService.selectAllImpRep(new Page<Object>(pageSize, countSize), orderCode, name, time);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", importRepertoryPage.getTotal());
+ map.put("row", importRepertoryPage.getRecords());
+ return Result.success(map);
+ }
+
+ @ApiOperation("鏍规嵁id鏌ョ湅鍏ュ簱璇︽儏")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鍏ュ簱id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectImpRepById")
+ public Result selectImpRepById(Integer id) {
+ return Result.success(importRepertoryService.getById(id));
+ }
+
+ @ApiOperation(value = "鏍规嵁鍏ュ簱id鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鍏ュ簱id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delImpRep")
+ public Result delImpRep(Integer id) {
+ importRepertoryService.delImpRep(id);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鎵归噺鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "ids", value = "ids", dataTypeClass = Integer.class, dataType = "List", required = true)
+ })
+ @PostMapping("/delAllImpRep")
+ public Result delAllImpRep(@RequestParam("ids") List<Integer> ids) {
+ importRepertoryService.delAllImpRep(ids);
+ return Result.success();
+ }
+
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/RepertoryController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/RepertoryController.java
index e9fea45..9db780e 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/RepertoryController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/RepertoryController.java
@@ -34,11 +34,12 @@
@ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
@ApiImplicitParam(name = "specifications", value = "浜у搧鍨嬪彿", dataTypeClass = String.class),
@ApiImplicitParam(name = "time", value = "鍏ュ簱鏃ユ湡", dataTypeClass = String.class),
- @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "checkState", value = "妫�楠岀姸鎬�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
})
@GetMapping("/selectAllRepertory")
- public Result selectAllRepertory(int pageSize, int countSize, String name, String specifications, String time, Integer type) {
- IPage<Map<String, Object>> repertoryPage = repertoryService.selectAllRepertory(new Page<Object>(pageSize, countSize), name, specifications, time, type);
+ public Result selectAllRepertory(int pageSize, int countSize, String name, String specifications, String time, Integer type,Integer checkState) {
+ IPage<Map<String, Object>> repertoryPage = repertoryService.selectAllRepertory(new Page<Object>(pageSize, countSize), name, specifications, time, type,checkState);
Map<String, Object> map = new HashMap<>();
map.put("total", repertoryPage.getTotal());
map.put("row", repertoryPage.getRecords());
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/mapper/ConsignmentMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/ConsignmentMapper.java
new file mode 100644
index 0000000..aadad50
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/ConsignmentMapper.java
@@ -0,0 +1,19 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.mom.pojo.Consignment;
+
+import java.util.List;
+
+/**
+ * 鎴愬搧鍙戣揣琛�(Consignment)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author zss
+ * @since 2023-08-10 15:08:02
+ */
+public interface ConsignmentMapper extends BaseMapper<Consignment> {
+
+ //鏌ヨ鎵�鏈夊彂璐ц褰�
+ List<Consignment> selectAll();
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/mapper/ImportRepertoryMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/ImportRepertoryMapper.java
new file mode 100644
index 0000000..f3c0f5d
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/ImportRepertoryMapper.java
@@ -0,0 +1,21 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.ImportRepertory;
+
+import java.util.Map;
+
+/**
+ * 鎴愬搧鍏ュ簱琛�(ImportRepertory)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author zss
+ * @since 2023-08-10 10:27:01
+ */
+public interface ImportRepertoryMapper extends BaseMapper<ImportRepertory> {
+
+ //鏌ヨ鍏ュ簱鍒楄〃
+ IPage<Map<String, Object>> selectAllImpRep(Page<Object> page, String orderCode, String name, String time);
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java
index 46b7c22..958b9ca 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java
@@ -17,6 +17,6 @@
public interface RepertoryMapper extends BaseMapper<Repertory> {
//鏌ヨ鎵�鏈夊簱瀛樺垪琛�
- IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type);
+ IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Consignment.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Consignment.java
new file mode 100644
index 0000000..38d023e
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Consignment.java
@@ -0,0 +1,106 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 鎴愬搧鍙戣揣琛�(Consignment)琛ㄥ疄浣撶被
+ *
+ * @author zss
+ * @since 2023-08-10 15:08:02
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@TableName("consignment")
+public class Consignment implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ **/
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鍚堝悓缂栧彿
+ **/
+ private String customerCode;
+
+ /**
+ * 鎶艰繍鍗曠紪鍙�
+ **/
+ private String escortCode;
+
+ /**
+ * 璁㈠崟缂栧彿
+ **/
+ private String orderCode;
+
+ /**
+ * 鏉愭枡缂栫爜
+ **/
+ private String code;
+
+ /**
+ * 鏉愭枡鍚嶇О
+ **/
+ private String name;
+
+ /**
+ * 鍨嬪彿瑙勬牸
+ **/
+ private String specifications;
+
+ /**
+ * 鍗曚綅
+ **/
+ private String unit;
+
+ /**
+ * 鏁伴噺
+ **/
+ private Integer number;
+
+ /**
+ * 缂栧埗浜恒�佸彂璐т汉锛堝綋鍓嶇敤鎴峰悕锛�
+ **/
+ private String userName;
+
+ /**
+ * 妫�鏌ヤ汉鍛�
+ **/
+ private String checkName;
+
+ /**
+ * 瑁呴厤浜哄憳
+ **/
+ private String fitName;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ private Integer state;
+
+ /**
+ * 鍙戣揣鏃ユ湡
+ **/
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateTime;
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/ImportRepertory.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/ImportRepertory.java
new file mode 100644
index 0000000..a64c71e
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/ImportRepertory.java
@@ -0,0 +1,94 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 鎴愬搧鍏ュ簱琛�(ImportRepertory)琛ㄥ疄浣撶被
+ *
+ * @author zss
+ * @since 2023-08-10 10:27:02
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@TableName("import_repertory")
+public class ImportRepertory implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ **/
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 璁㈠崟缂栫爜
+ **/
+ private String orderCode;
+
+ /**
+ * 鏉愭枡缂栫爜
+ **/
+ private String code;
+
+ /**
+ * 鏉愭枡鍚嶇О
+ **/
+ private String name;
+
+ /**
+ * 鍨嬪彿瑙勬牸
+ **/
+ private String specifications;
+
+ /**
+ * 鍗曚綅
+ **/
+ private String unit;
+
+ /**
+ * 鏁伴噺
+ **/
+ private Integer number;
+
+ /**
+ * 鍏ュ簱浜猴紙褰撳墠鐢ㄦ埛鍚嶏級
+ **/
+ private String userName;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ private Integer state;
+
+ /**
+ * 鍏ュ簱鏃ユ湡
+ **/
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * ${column.comment}
+ **/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ **/
+ private String note;
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java
index 331ef8c..5a788ff 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java
@@ -52,20 +52,6 @@
**/
private String specifications;
- /**
- * 璇曢獙瑕佹眰
- **/
- private String requirements;
-
- /**
- * 宸ヨ壓鏂囦欢缂栧彿
- **/
- private String documentNumber;
-
- /**
- * 搴撲綅鍙�
- **/
- private Integer seat;
/**
* 鍗曚綅
@@ -82,11 +68,8 @@
**/
private String userName;
- /**
- * ${column.comment}
- **/
+
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
/**
@@ -114,5 +97,10 @@
* 绫诲瀷 0:鎴愬搧;1:鍗婃垚鍝�
**/
private Integer type;
+
+ /**
+ *妫�楠岀姸鎬�0:鏈楠�;1:宸叉楠�
+ **/
+ private Integer checkState;
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java
new file mode 100644
index 0000000..d851e48
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java
@@ -0,0 +1,53 @@
+package com.yuanchu.mom.pojo.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ConsignmentDto {
+
+ //璁㈠崟缂栧彿
+ @JsonSerialize
+ private String orderCode;
+
+ //鍚堝悓缂栧彿
+ @JsonSerialize
+ private String customerCode;
+
+ //瀹㈡埛鍚嶇О
+ @JsonSerialize
+ private String proname;
+
+ //鍒拌揣鍦板潃
+ @JsonSerialize
+ private String adress;
+
+ //鏀惰揣鑱旂郴浜�
+ @JsonSerialize
+ private String username;
+
+ //鎵嬫満鍙�
+ @JsonSerialize
+ private String phone ;
+
+ //浜у搧淇℃伅
+ @JsonSerialize
+ private List<ConsignmentDto2> messages;
+
+ //妫�鏌ヤ汉鍛�
+ @JsonSerialize
+ private String checkName;
+
+ //瑁呴厤浜哄憳
+ @JsonSerialize
+ private String fitName;
+}
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
new file mode 100644
index 0000000..823535f
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ImportRepertoryDto.java
@@ -0,0 +1,49 @@
+package com.yuanchu.mom.pojo.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+@Data
+public class ImportRepertoryDto {
+ /**
+ * 璁㈠崟缂栫爜
+ **/
+ @JsonSerialize
+ private String orderCode;
+
+ /**
+ * 鏉愭枡缂栫爜
+ **/
+ @JsonSerialize
+ private String code;
+
+ /**
+ * 鏉愭枡鍚嶇О
+ **/
+ @JsonSerialize
+ private String name;
+
+ /**
+ * 鍨嬪彿瑙勬牸
+ **/
+ @JsonSerialize
+ private String specifications;
+
+ /**
+ * 鍗曚綅
+ **/
+ @JsonSerialize
+ private String unit;
+
+ /**
+ * 鏁伴噺
+ **/
+ @JsonSerialize
+ private Integer number;
+
+ /**
+ * 澶囨敞
+ **/
+ @JsonSerialize
+ private String note;
+}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/ConsignmentService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/ConsignmentService.java
new file mode 100644
index 0000000..a28acaf
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/ConsignmentService.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.Consignment;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto;
+
+/**
+ * 鎴愬搧鍙戣揣琛�(Consignment)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author zss
+ * @since 2023-08-10 15:08:02
+ */
+public interface ConsignmentService extends IService<Consignment> {
+
+ /**
+ * 鏂板鎴愬搧鍙戣揣
+ * @param name
+ * @param consignmentDto
+ */
+ String addCon(String name, ConsignmentDto consignmentDto);
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/ImportRepertoryService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/ImportRepertoryService.java
new file mode 100644
index 0000000..6e851a2
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/ImportRepertoryService.java
@@ -0,0 +1,45 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.ImportRepertory;
+import com.yuanchu.mom.pojo.dto.ImportRepertoryDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鎴愬搧鍏ュ簱琛�(ImportRepertory)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author zss
+ * @since 2023-08-10 10:27:01
+ */
+public interface ImportRepertoryService extends IService<ImportRepertory> {
+
+ //鏂板鎴愬搧鍏ュ簱
+ void addImpRep(String name, ImportRepertoryDto importRepertoryDto);
+
+ /**
+ * 鏌ヨ鍏ュ簱鍒楄〃
+ * @param page
+ * @param orderCode
+ * @param name
+ * @param time
+ * @return
+ */
+ IPage<Map<String, Object>> selectAllImpRep(Page<Object> page, String orderCode, String name, String time);
+
+ /**
+ * 鏍规嵁id鍒犻櫎
+ * @param id
+ */
+ void delImpRep(Integer id);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ */
+ void delAllImpRep(List<Integer> ids);
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
index 54bec43..03a42dc 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
@@ -24,6 +24,6 @@
* @param type
* @return
*/
- IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type);
+ IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);
}
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
new file mode 100644
index 0000000..0191276
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
@@ -0,0 +1,82 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.mapper.ConsignmentMapper;
+import com.yuanchu.mom.mapper.RepertoryMapper;
+import com.yuanchu.mom.pojo.Consignment;
+import com.yuanchu.mom.pojo.Repertory;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto2;
+import com.yuanchu.mom.service.ConsignmentService;
+import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 鎴愬搧鍙戣揣琛�(Consignment)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author zss
+ * @since 2023-08-10 15:08:02
+ */
+@Service
+public class ConsignmentServiceImpl extends ServiceImpl<ConsignmentMapper, Consignment> implements ConsignmentService {
+
+ @Resource
+ ConsignmentMapper consignmentMapper;
+
+ @Resource
+ RepertoryMapper repertoryMapper;
+
+ //鏂板鎴愬搧鍙戣揣
+ @Override
+ public String addCon(String name, ConsignmentDto consignmentDto) {
+ //濡傛灉璇ヨ鍗曞凡缁忓彂杩囪揣浜嗕笉鑳藉啀鍙戣揣
+ List<Consignment> consignments = consignmentMapper.selectAll();
+ for (Consignment consignment : consignments) {
+ if (consignment.getCustomerCode().equals(consignmentDto.getCustomerCode())) {
+ return "璇ュ悎鍚岃鍗曞凡鍙戣繃璐�,鏃犳硶鍐嶆鍙戣揣!";
+ } else {
+ /*鏂板鎴愬搧鍙戣揣*/
+ List<ConsignmentDto2> messages = consignmentDto.getMessages();
+ for (ConsignmentDto2 message : messages) {
+ //鏌ヨ浜у搧缂栫爜(閫氳繃鍦ㄦ垚鍝佸簱瀛樿〃涓殑浜у搧鍚嶇О,瑙勬牸鍨嬪彿浠ュ強鍗曚綅杩涜鏌ユ壘)
+ LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Repertory::getName, message.getName())
+ .eq(Repertory::getSpecifications, message.getSpecifications())
+ .eq(Repertory::getUnit, message.getUnit())
+ .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(MyUtil.getTimeSixNumberCode("YY"))
+ .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 "璇ヤ骇鍝佽繕鏈楠�,涓嶈兘鍙戣揣!";
+ }
+ }
+ }
+ return "鍙戣揣鎴愬姛!";
+ }
+}
+
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
new file mode 100644
index 0000000..7e732b4
--- /dev/null
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
@@ -0,0 +1,120 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.mapper.ImportRepertoryMapper;
+import com.yuanchu.mom.mapper.RepertoryMapper;
+import com.yuanchu.mom.pojo.ImportRepertory;
+import com.yuanchu.mom.pojo.Repertory;
+import com.yuanchu.mom.pojo.dto.ImportRepertoryDto;
+import com.yuanchu.mom.service.ImportRepertoryService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鎴愬搧鍏ュ簱琛�(ImportRepertory)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author zss
+ * @since 2023-08-10 10:27:01
+ */
+@Service
+public class ImportRepertoryServiceImpl extends ServiceImpl<ImportRepertoryMapper, ImportRepertory> implements ImportRepertoryService {
+
+ @Resource
+ ImportRepertoryMapper importRepertoryMapper;
+
+ @Resource
+ RepertoryMapper repertoryMapper;
+
+ //鏂板鎴愬搧鍏ュ簱
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addImpRep(String name, ImportRepertoryDto importRepertoryDto) {
+ //鏂板鎴愬搧鍏ュ簱
+ ImportRepertory importRepertory = new ImportRepertory();
+ BeanUtils.copyProperties(importRepertoryDto, importRepertory);
+ importRepertory.setUserName(name);
+ importRepertoryMapper.insert(importRepertory);
+ //鏂板鎴愬搧搴撳瓨
+ //濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
+ LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Repertory::getOrderCode, importRepertoryDto.getOrderCode())
+ .eq(Repertory::getCode, importRepertoryDto.getCode())
+ .eq(Repertory::getName, importRepertoryDto.getName())
+ .eq(Repertory::getSpecifications, importRepertoryDto.getSpecifications())
+ .eq(Repertory::getUnit, importRepertoryDto.getUnit())
+ .eq(Repertory::getType, 0);
+ Repertory rep = repertoryMapper.selectOne(queryWrapper);
+ if (rep != null && rep.getCheckState() == 0) {
+ rep.setNumber(rep.getNumber() + importRepertoryDto.getNumber());
+ rep.setUserName(name);
+ repertoryMapper.updateById(rep);
+ } else {
+ //濡傛灉闄や簡搴撳瓨鍒殑淇℃伅鏈変换浣曚竴涓笉涓�鏍�,鍒欐柊澧炰竴鏉℃垚鍝佸簱瀛�
+ Repertory repertory = new Repertory();
+ BeanUtils.copyProperties(importRepertoryDto, repertory);
+ repertory.setUserName(name);
+ repertory.setType(0);
+ repertory.setCheckState(0);
+ repertoryMapper.insert(repertory);
+ }
+ }
+
+ //鏌ヨ鍏ュ簱鍒楄〃
+ @Override
+ public IPage<Map<String, Object>> selectAllImpRep(Page<Object> page, String orderCode, String name, String time) {
+ return importRepertoryMapper.selectAllImpRep(page, orderCode, name, time);
+ }
+
+ //鏍规嵁id鍒犻櫎
+ @Override
+ public void delImpRep(Integer id) {
+ //鍒犻櫎鍏ュ簱璁板綍
+ ImportRepertory importRepertory = importRepertoryMapper.selectById(id);
+ importRepertory.setState(0);
+ importRepertoryMapper.updateById(importRepertory);
+ //搴撳瓨涔熻鍑忓皯
+ LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Repertory::getOrderCode, importRepertory.getOrderCode())
+ .eq(Repertory::getCode, importRepertory.getCode())
+ .eq(Repertory::getName, importRepertory.getName())
+ .eq(Repertory::getSpecifications, importRepertory.getSpecifications())
+ .eq(Repertory::getUnit, importRepertory.getUnit())
+ .eq(Repertory::getType, 0)
+ .eq(Repertory::getCheckState, 0);
+ Repertory rep = repertoryMapper.selectOne(queryWrapper);
+ rep.setNumber(rep.getNumber() - importRepertory.getNumber());
+ repertoryMapper.updateById(rep);
+ }
+
+ //鎵归噺鍒犻櫎
+ @Override
+ public void delAllImpRep(List<Integer> ids) {
+ List<ImportRepertory> importRepertories = importRepertoryMapper.selectBatchIds(ids);
+ for (ImportRepertory importRepertory : importRepertories) {
+ importRepertory.setState(0);
+ //鍒犻櫎鍏ュ簱璁板綍
+ importRepertoryMapper.updateById(importRepertory);
+ //鍑忓皯搴撳瓨
+ LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Repertory::getOrderCode, importRepertory.getOrderCode())
+ .eq(Repertory::getCode, importRepertory.getCode())
+ .eq(Repertory::getName, importRepertory.getName())
+ .eq(Repertory::getSpecifications, importRepertory.getSpecifications())
+ .eq(Repertory::getUnit, importRepertory.getUnit())
+ .eq(Repertory::getType, 0)
+ .eq(Repertory::getCheckState, 0);
+ Repertory rep = repertoryMapper.selectOne(queryWrapper);
+ rep.setNumber(rep.getNumber() - importRepertory.getNumber());
+ repertoryMapper.updateById(rep);
+ }
+ }
+}
+
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
index e2f095d..16fa0c9 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
@@ -25,8 +25,8 @@
//鏌ヨ鎵�鏈夊簱瀛樺垪琛�
@Override
- public IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type) {
- return repertoryMapper.selectAllRepertory(page,name,specifications,time,type);
+ public IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState) {
+ return repertoryMapper.selectAllRepertory(page,name,specifications,time,type,checkState);
}
}
diff --git a/inventory-server/src/main/resources/mapper/ConsignmentMapper.xml b/inventory-server/src/main/resources/mapper/ConsignmentMapper.xml
new file mode 100644
index 0000000..ccc21e2
--- /dev/null
+++ b/inventory-server/src/main/resources/mapper/ConsignmentMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yuanchu.mom.mapper.ConsignmentMapper">
+ <select id="selectAll" resultType="com.yuanchu.mom.pojo.Consignment">
+ select * from mom_ocean.consignment where state=1
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml b/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml
new file mode 100644
index 0000000..2c7fd0e
--- /dev/null
+++ b/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yuanchu.mom.mapper.ImportRepertoryMapper">
+ <select id="selectAllImpRep" resultType="java.util.Map">
+ select id,
+ order_code,
+ code,
+ name,
+ specifications,
+ unit,
+ number,
+ user_name,
+ create_time
+ from mom_ocean.import_repertory
+ where state=1
+ <if test="orderCode!=null and orderCode!=''">
+ and order_code like concat('%',#{orderCode},'%')
+ </if>
+ <if test="name!=null and name!=''">
+ and name like concat('%',#{name},'%')
+ </if>
+ <if test="time!=null and time!=''">
+ and create_time=#{time}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index 35b3fe5..b556cba 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -6,27 +6,28 @@
name,
specifications,
code,
- requirements,
- order_code,
- seat,
+ check_state,
user_name,
DATE_FORMAT(create_time, '%Y-%m-%d') '鍏ュ簱鏃ユ湡',
note
from mom_ocean.repertory
<where>
and state=1
- <if test="name!=null">
- and name =#{name}
+ <if test="name!=null and name!=''">
+ and name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="specifications!=null ">
- and specifications=#{specifications}
+ <if test="specifications!=null and specifications!=''">
+ and specifications LIKE CONCAT('%',#{specifications},'%')
</if>
- <if test="time!=null ">
+ <if test="time!=null and time!=''">
and create_time=#{time}
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and type=#{type}
</if>
+ <if test="checkState!=null and checkState!=''">
+ and check_state=#{checkState}
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
diff --git a/sale-server/pom.xml b/sale-server/pom.xml
index 7d53d36..3633f72 100644
--- a/sale-server/pom.xml
+++ b/sale-server/pom.xml
@@ -22,11 +22,7 @@
<artifactId>standard-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>inventory-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
+
<dependency>
<groupId>com.yuanchu.mom</groupId>
<artifactId>user-server</artifactId>
diff --git a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index f12fdab..97fa896 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -18,10 +18,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.lang.reflect.Array;
+import java.util.*;
/**
* <p>
@@ -100,10 +98,10 @@
@ApiOperation(value = "鎵归噺鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "ids", value = "閿�鍞崟id", dataTypeClass = String.class, dataType = "List", required = true)
+ @ApiImplicitParam(name = "ids", value = "ids", dataTypeClass = Integer.class, dataType = "List",required = true)
})
@PostMapping("/delAllSale")
- public Result delAllSale( List<Integer> ids) {
+ public Result delAllSale( @RequestParam("ids") List<Integer> ids) {
saleService.delAllSale(ids);
return Result.success();
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java b/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
index 538c976..8193cc4 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
@@ -19,4 +19,7 @@
//鏌ヨ閿�鍞崟鍒楄〃
IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime);
+
+
+
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java b/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
index 0890f89..5e03988 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
@@ -75,7 +75,6 @@
private Date checkTime;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java b/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
index 7ce3eb0..517f1d8 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
@@ -49,7 +49,6 @@
private String price;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java b/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
new file mode 100644
index 0000000..7e6bd4e
--- /dev/null
+++ b/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
@@ -0,0 +1,40 @@
+package com.yuanchu.mom.pojo.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class ConsignmentDto1 {
+
+ //璁㈠崟缂栧彿
+ @JsonSerialize
+ private String orderCode;
+
+ //鍚堝悓缂栧彿
+ @JsonSerialize
+ private String customerCode;
+
+ //瀹㈡埛鍚嶇О
+ @JsonSerialize
+ private String proname;
+
+ //鍒拌揣鍦板潃
+ @JsonSerialize
+ private String adress;
+
+ //鏀惰揣鑱旂郴浜�
+ @JsonSerialize
+ private String username;
+
+ //鎵嬫満鍙�
+ @JsonSerialize
+ private String phone ;
+
+ //浜у搧淇℃伅
+ @JsonSerialize
+ private List<ConsignmentDto2> messages;
+}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java b/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
new file mode 100644
index 0000000..5ae53de
--- /dev/null
+++ b/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.pojo.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ConsignmentDto2 {
+
+ //浜у搧淇℃伅
+ @JsonSerialize
+ private String name;
+
+ //瑙勬牸鍨嬪彿
+ @JsonSerialize
+ private String specifications;
+
+ //鍗曚綅
+ @JsonSerialize
+ private String unit;
+
+ //鍙戣揣鏁伴噺
+ @JsonSerialize
+ private Integer number;
+}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java b/sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java
index a84ddb7..940eeda 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java
@@ -4,13 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Sale;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto1;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.pojo.dto.vo.SaleVo;
-import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* <p>
@@ -71,4 +70,11 @@
* @param id
*/
void check(String checkname,Integer id,Integer type);
+
+ /**
+ *鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
+ * @param orderNumber
+ * @return
+ */
+ ConsignmentDto1 selSale(String orderNumber);
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index df08cff..f661cff 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -7,10 +7,11 @@
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.mapper.SaleMapper;
import com.yuanchu.mom.pojo.SaleMaterial;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto1;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto2;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.pojo.dto.SaleMaterialDto;
import com.yuanchu.mom.pojo.dto.vo.SaleVo;
-import com.yuanchu.mom.service.SaleMaterialService;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -20,7 +21,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -136,4 +136,26 @@
sale.setCheckTime(new Date());
saleMapper.updateById(sale);
}
+
+ //鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
+ @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()));
+ List<ConsignmentDto2> dto2List = saleMaterials.stream().map(saleMaterial -> {
+ ConsignmentDto2 consignmentDto2 = new ConsignmentDto2();
+ BeanUtils.copyProperties(saleMaterial, consignmentDto2);
+ return consignmentDto2;
+ }).collect(Collectors.toList());
+ ConsignmentDto1 consignmentDto1 = ConsignmentDto1.builder()
+ .orderCode(orderNumber)
+ .customerCode(sale.getCode())
+ .proname(sale.getProname())
+ .adress(sale.getAdress())
+ .username(sale.getUsername())
+ .phone(sale.getPhone())
+ .messages(dto2List)
+ .build();
+ return consignmentDto1;
+ }
}
diff --git a/sale-server/src/main/resources/mapper/SaleMapper.xml b/sale-server/src/main/resources/mapper/SaleMapper.xml
index 92e882b..91951ff 100644
--- a/sale-server/src/main/resources/mapper/SaleMapper.xml
+++ b/sale-server/src/main/resources/mapper/SaleMapper.xml
@@ -12,18 +12,19 @@
from mom_ocean.sale
<where>
state=1
- <if test="orderNumber!=null">
- and order_number=#{orderNumber}
+ <if test="orderNumber!=null and orderNumber!=''">
+ and order_number LIKE CONCAT('%',#{orderNumber},'%')
</if>
- <if test="name!=null">
- and name=#{name}
+ <if test="name!=null and name!=''">
+ and name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and type=#{type}
</if>
- <if test="delTime!=null">
+ <if test="delTime!=null and delTime!=''">
and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
</if>
</where>
</select>
+
</mapper>
diff --git a/sale-server/src/main/resources/mapper/SaleMaterialMapper.xml b/sale-server/src/main/resources/mapper/SaleMaterialMapper.xml
index a53fc17..a83f25e 100644
--- a/sale-server/src/main/resources/mapper/SaleMaterialMapper.xml
+++ b/sale-server/src/main/resources/mapper/SaleMaterialMapper.xml
@@ -2,11 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SaleMaterialMapper">
<select id="selectSaleDatil" resultType="com.yuanchu.mom.pojo.SaleMaterial">
- select id, name, specifications, unit, number, price, state, create_time, update_time, sale_id
+ select id,
+ name,
+ specifications,
+ unit,
+ number,
+ price,
+ state,
+ create_time,
+ update_time,
+ sale_id
from mom_ocean.sale_material
- where state=1
- <if test="id!=null">
- and sale_id=#{id}
- </if>
+ where state = 1
+ and sale_id = #{id}
</select>
</mapper>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
index 3dbf938..4ede6fb 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
@@ -90,10 +90,10 @@
@ApiOperation(value = "鎵归噺鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "ids", value = "閿�鍞崟id", dataTypeClass = String.class, dataType = "List", required = true)
+ @ApiImplicitParam(name = "ids", value = "閿�鍞崟id", dataTypeClass = Integer.class, dataType = "List", required = true)
})
@PostMapping("/delAllTech")
- public Result delAllTech( List<Integer> ids) {
+ public Result delAllTech(@RequestParam("ids") List<Integer> ids) {
technologyTemplateService.delAllTech(ids);
return Result.success("鎵归噺鍒犻櫎鎴愬姛!");
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
index d333c76..c6d5499 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
@@ -47,7 +47,6 @@
private Integer type;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
diff --git a/standard-server/src/main/resources/mapper/OrdersMapper.xml b/standard-server/src/main/resources/mapper/OrdersMapper.xml
index a691546..ea3942f 100644
--- a/standard-server/src/main/resources/mapper/OrdersMapper.xml
+++ b/standard-server/src/main/resources/mapper/OrdersMapper.xml
@@ -17,16 +17,16 @@
o.state
from mom_ocean.orders o,mom_ocean.material m
<where>
- <if test="orderCode != null">
- and order_code = #{orderCode}
+ <if test="orderCode != null and orderCode!=''">
+ and order_code LIKE CONCAT('%',#{orderCode},'%')
</if>
- <if test="time != null">
+ <if test="time != null and time!=''">
and o.create_time = #{time}
</if>
- <if test="name != null">
- and m.name = #{name}
+ <if test="name != null and name!=''">
+ and m.name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="state != null">
+ <if test="state != null and state!=''">
and o.state = #{state}
</if>
and o.code=m.code
diff --git a/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 641694e..01e5925 100644
--- a/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -31,13 +31,13 @@
from mom_ocean.technology_template t
<where>
state=1
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and type=#{type}
</if>
- <if test="element!=null">
+ <if test="element!=null and element!=''">
and element like concat('%',#{element},'%')
</if>
- <if test="father!=null">
+ <if test="father!=null and father!=''">
and father like concat('%',#{father},'%')
</if>
</where>
--
Gitblit v1.9.3