From fe82da7485601580104c058f382405cc0cc9e043 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 22 一月 2026 13:41:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 10
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 6
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 7
src/main/java/com/ruoyi/home/controller/HomeController.java | 96 ++++++++-----
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 6
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 153 +++++++++++----------
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java | 2
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java | 20 ++
src/main/resources/mapper/stock/StockInRecordMapper.xml | 7
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 4
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 3
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 4
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 4
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 4
src/main/resources/mapper/lavorissue/LavorIssueMapper.xml | 4
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 31 ++++
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1
src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java | 4
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 2
src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml | 2
20 files changed, 233 insertions(+), 137 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 4747ffe..b303787 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -76,14 +76,12 @@
@Override
public void initApproveNodes(String approveUserIds,String approveID,Long tenantId) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
- ApproveProcess approve = getApproveById(approveID);
String[] names = approveUserIds.split(",");
- String approveId = approve.getApproveId();
for (int i = 0; i < names.length; i++) {
SysUser sysUser = sysUserMapper.selectUserById(Long.parseLong(names[i]));
if (sysUser == null) continue;
ApproveNode approveNode = new ApproveNode();
- approveNode.setApproveProcessId(approveId);
+ approveNode.setApproveProcessId(approveID);
approveNode.setApproveNodeOrder(i +1);
approveNode.setApproveNodeUser(sysUser.getNickName());
approveNode.setApproveNodeUserId(sysUser.getUserId());
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 48a3e9f..effa6a4 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.ApproveNodeMapper;
@@ -189,12 +190,9 @@
@Override
public ApproveProcess getApproveById(String id) {
- LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ApproveProcess::getApproveId, id);
- queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
- queryWrapper.last("limit 1");
- ApproveProcess one = getOne(queryWrapper);
+ ApproveProcess one = approveProcessMapper.selectList(Wrappers.<ApproveProcess>lambdaQuery()
+ .eq(ApproveProcess::getApproveId,id)
+ .eq(ApproveProcess::getApproveDelete,0)).get(0);
one.setCommonFileList(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
.eq(CommonFile::getCommonId, one.getId())
.eq(CommonFile::getType, FileNameType.ApproveProcess.getValue())));
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
index 6f06563..53ae816 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
@@ -34,7 +34,7 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody NoticeType noticeType) {
- return AjaxResult.success(noticeTypeService.save(noticeType));
+ return AjaxResult.success(noticeTypeService.saveOrUpdate(noticeType));
}
/**
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 3d26445..6f293d4 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -30,7 +30,7 @@
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, CustomerVisits customerVisits){
+ public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
return AjaxResult.success(listPage);
}
@@ -39,12 +39,37 @@
@ApiOperation("瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CustomerVisits customerVisits){
+ public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
boolean save = customerVisitsService.save(customerVisits);
- if (save){
+ if (save) {
return AjaxResult.success("娣诲姞鎴愬姛");
}
return AjaxResult.error("娣诲姞澶辫触");
}
+ @Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
+ @ApiOperation("瀹㈡埛鎷滆-缂栬緫")
+ @PostMapping("update")
+ public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
+ boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
+ if (updateResult) {
+ return AjaxResult.success("缂栬緫鎴愬姛");
+ }
+ return AjaxResult.error("缂栬緫澶辫触");
+ }
+
+ @Log(title = "瀹㈡埛鎷滆-鍒犻櫎", businessType = BusinessType.DELETE)
+ @ApiOperation("瀹㈡埛鎷滆-鍒犻櫎")
+ @DeleteMapping("{customerId}")
+ public AjaxResult deleteCustomerVisit(@PathVariable Integer customerId) {
+ if (customerId == null) {
+ return AjaxResult.error("瀹㈡埛ID涓嶈兘涓虹┖");
+ }
+ boolean deleteResult = customerVisitsService.removeById(customerId);
+ if (deleteResult) {
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
+ return AjaxResult.error("鍒犻櫎澶辫触");
+ }
+
}
diff --git a/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java b/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
index f4463e2..1f8d1ef 100644
--- a/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
+++ b/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.customervisits.pojo.CustomerVisits;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* @author :yys
@@ -11,4 +12,7 @@
*/
public interface CustomerVisitsService extends IService<CustomerVisits> {
IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits);
+
+ boolean updateCustomerVisit(CustomerVisits customerVisits);
+
}
diff --git a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
index 5023c99..319d478 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -11,6 +11,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @author :yys
@@ -26,10 +27,27 @@
@Override
public IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits) {
LambdaQueryWrapper<CustomerVisits> customerVisitsLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())){
+ if (customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())) {
customerVisitsLambdaQueryWrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
}
Page page1 = customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
return page1;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateCustomerVisit(CustomerVisits customerVisits) {
+ if (customerVisits == null || customerVisits.getId() == null) {
+ return false;
+ }
+
+ if (StringUtils.isEmpty(customerVisits.getCustomerName())
+ || StringUtils.isEmpty(customerVisits.getPurposeVisit())
+ || StringUtils.isEmpty(customerVisits.getVisitAddress())
+ || StringUtils.isEmpty(customerVisits.getPurposeDate())) {
+ return false;
+ }
+
+ return updateById(customerVisits);
+ }
}
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 3224c0f..edda887 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -36,6 +36,31 @@
@Autowired
private HomeService homeService;
+ /********************************************************鍩虹绫�*****************************************************/
+ @GetMapping("/todos")
+ @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
+ @ApiOperation("寰呭姙浜嬮」")
+ public AjaxResult todos(ApproveProcess req) throws ParseException {
+ List<ApproveProcess> approveProcessList = homeService.todos();
+ return AjaxResult.success(approveProcessList);
+ }
+
+ @GetMapping("/approveAndDeviceTodos")
+ @ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
+ public AjaxResult approveAndDeviceTodos(){
+ Map<String, Object> map = homeService.approveAndDeviceTodos();
+ return AjaxResult.success(map);
+ }
+
+ @GetMapping("/noticesCount")
+ @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
+ public AjaxResult noticesCount(){
+ Long count = homeService.noticesCount();
+ return AjaxResult.success(count);
+ }
+
+
+ /********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
@ApiOperation("閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
@@ -53,43 +78,8 @@
return AjaxResult.success(analysisCustomerContractAmounts);
}
- @GetMapping("/qualityStatistics")
- @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
- @ApiOperation("璐ㄩ噺鍒嗘瀽")
- public AjaxResult qualityStatistics(QualityStatisticsDto req) {
- QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
- return AjaxResult.success(qualityStatisticsDto);
- }
- @GetMapping("/todos")
- @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
- @ApiOperation("寰呭姙浜嬮」")
- public AjaxResult todos(ApproveProcess req) throws ParseException {
- List<ApproveProcess> approveProcessList = homeService.todos();
- return AjaxResult.success(approveProcessList);
- }
-
- @GetMapping("/statisticsReceivablePayable")
- @Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
- @ApiOperation("搴旀敹搴斾粯缁熻")
- public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @RequestParam(value = "type", defaultValue = "1") Integer type ) {
- StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
- return AjaxResult.success(statisticsReceivablePayable);
- }
-
- @GetMapping("/approveAndDeviceTodos")
- @ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
- public AjaxResult approveAndDeviceTodos(){
- Map<String, Object> map = homeService.approveAndDeviceTodos();
- return AjaxResult.success(map);
- }
-
- @GetMapping("/noticesCount")
- @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
- public AjaxResult noticesCount(){
- Long count = homeService.noticesCount();
- return AjaxResult.success(count);
- }
+ /********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/progressStatistics")
@ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
public AjaxResult progressStatistics(){
@@ -102,4 +92,38 @@
ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
return AjaxResult.success(productionTurnoverDto);
}
+
+
+ /********************************************************璐ㄩ噺绫�*****************************************************/
+ @GetMapping("/qualityStatistics")
+ @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
+ @ApiOperation("璐ㄩ噺鍒嗘瀽")
+ public AjaxResult qualityStatistics(QualityStatisticsDto req) {
+ QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
+ return AjaxResult.success(qualityStatisticsDto);
+ }
+
+
+ /********************************************************璐㈠姟绫�*****************************************************/
+ @GetMapping("/statisticsReceivablePayable")
+ @Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
+ @ApiOperation("搴旀敹搴斾粯缁熻")
+ public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @RequestParam(value = "type", defaultValue = "1") Integer type ) {
+ StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
+ return AjaxResult.success(statisticsReceivablePayable);
+ }
+
+
+ /********************************************************浠撳偍绫�*****************************************************/
+
+
+
+
+
+
+
+
+
+
+
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 843e4a6..08d65fa 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -27,6 +27,10 @@
@Excel(name = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ @Excel(name = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
+
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
private String productName;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 20e52ad..20417ae 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -20,7 +20,8 @@
@ApiModelProperty(value = "浜у搧id")
private Long productModelId;
- @ApiModelProperty(value = "鏁伴噺")
+ //鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺
+ @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -29,4 +30,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 5d1e454..9d466ad 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -189,82 +189,89 @@
productionProductOutput.setProductMainId(productionProductMain.getId());
productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
+ productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
productionProductOutputMapper.insert(productionProductOutput);
- /*鏂板璐ㄦ*/
- //瀵瑰簲鐨勮繃绋嬫鎴栬�呭嚭鍘傛
- List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));
- int inspectType = 1;
- String process = productProcess.getName();//宸ュ簭
- if (productProcessRouteItem.getDragSort()==productProcessRouteItems.size()){
- //鏈�鍚庝竴閬撳伐搴忕敓鎴愬嚭鍘傛
- inspectType = 2;
- process = null;
- }
- Product product = productMapper.selectById(productModel.getProductId());
- QualityInspect qualityInspect = new QualityInspect();
- qualityInspect.setProductId(product.getId());
- qualityInspect.setProductName(product.getProductName());
- qualityInspect.setModel(productModel.getModel());
- qualityInspect.setUnit(productModel.getUnit());
- qualityInspect.setQuantity(dto.getQuantity());
- qualityInspect.setProcess(productProcess.getName());
- qualityInspect.setInspectState(0);
- qualityInspect.setInspectType(inspectType);
- qualityInspect.setProductMainId(productionProductMain.getId());
- qualityInspect.setProductModelId(productModel.getId());
- qualityInspectMapper.insert(qualityInspect);
- List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType,process);
- if (qualityTestStandard.size()>0){
- qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
- qualityInspectMapper.updateById(qualityInspect);
- qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
- .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandard.get(0).getId()))//榛樿鑾峰彇鏈�鏂扮殑
- .forEach(qualityTestStandardParam -> {
- QualityInspectParam param = new QualityInspectParam();
- BeanUtils.copyProperties(qualityTestStandardParam, param);
- param.setId(null);
- param.setInspectId(qualityInspect.getId());
- qualityInspectParamMapper.insert(param);
- });
- }
- /*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
- ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
- productWorkOrder.setCompleteQuantity(productWorkOrder.getCompleteQuantity().add(dto.getQuantity()));
- if (ObjectUtils.isNull(productWorkOrder.getActualStartTime())){
- productWorkOrder.setActualStartTime(LocalDate.now());//瀹為檯寮�濮嬫椂闂�
- }
- if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0){
- productWorkOrder.setActualEndTime(LocalDate.now());//瀹為檯缁撴潫鏃堕棿
- }
- productWorkOrderMapper.updateById(productWorkOrder);
- //鐢熶骇璁㈠崟
- ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
- if (ObjectUtils.isNull(productOrder.getStartTime())){
- productOrder.setStartTime(LocalDateTime.now());//寮�濮嬫椂闂�
- }
- if (productProcessRouteItem.getDragSort()==productProcessRouteItems.size()){
- //濡傛灉鏄渶鍚庝竴閬撳伐搴忔姤宸ヤ箣鍚庣敓浜ц鍗曞畬鎴愭暟閲�+
- productOrder.setCompleteQuantity(productOrder.getCompleteQuantity().add(dto.getQuantity()));
- if (productOrder.getCompleteQuantity().compareTo(productOrder.getQuantity()) == 0){
- productOrder.setEndTime(LocalDateTime.now());//缁撴潫鏃堕棿
+ //鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺
+ BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
+ //鍙湁鍚堟牸鏁伴噺>0鎵嶈兘澧炲姞鐩稿簲鏁版嵁
+ if (productQty.compareTo(BigDecimal.ZERO)>0) {
+ /*鏂板璐ㄦ*/
+ //瀵瑰簲鐨勮繃绋嬫鎴栬�呭嚭鍘傛
+ List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));
+ int inspectType = 1;
+ String process = productProcess.getName();//宸ュ簭
+ if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()) {
+ //鏈�鍚庝竴閬撳伐搴忕敓鎴愬嚭鍘傛
+ inspectType = 2;
+ process = null;
}
+ Product product = productMapper.selectById(productModel.getProductId());
+ QualityInspect qualityInspect = new QualityInspect();
+ qualityInspect.setProductId(product.getId());
+ qualityInspect.setProductName(product.getProductName());
+ qualityInspect.setModel(productModel.getModel());
+ qualityInspect.setUnit(productModel.getUnit());
+ qualityInspect.setQuantity(productQty);
+ qualityInspect.setProcess(productProcess.getName());
+ qualityInspect.setInspectState(0);
+ qualityInspect.setInspectType(inspectType);
+ qualityInspect.setProductMainId(productionProductMain.getId());
+ qualityInspect.setProductModelId(productModel.getId());
+ qualityInspectMapper.insert(qualityInspect);
+ List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
+ if (qualityTestStandard.size() > 0) {
+ qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
+ qualityInspectMapper.updateById(qualityInspect);
+ qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
+ .eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.get(0).getId()))//榛樿鑾峰彇鏈�鏂扮殑
+ .forEach(qualityTestStandardParam -> {
+ QualityInspectParam param = new QualityInspectParam();
+ BeanUtils.copyProperties(qualityTestStandardParam, param);
+ param.setId(null);
+ param.setInspectId(qualityInspect.getId());
+ qualityInspectParamMapper.insert(param);
+ });
+ }
+ /*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
+ productWorkOrder.setCompleteQuantity(productQty.add(dto.getQuantity()));
+ if (ObjectUtils.isNull(productWorkOrder.getActualStartTime())) {
+ productWorkOrder.setActualStartTime(LocalDate.now());//瀹為檯寮�濮嬫椂闂�
+ }
+ if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0) {
+ productWorkOrder.setActualEndTime(LocalDate.now());//瀹為檯缁撴潫鏃堕棿
+ }
+ productWorkOrderMapper.updateById(productWorkOrder);
+ //鐢熶骇璁㈠崟
+ ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+ if (ObjectUtils.isNull(productOrder.getStartTime())) {
+ productOrder.setStartTime(LocalDateTime.now());//寮�濮嬫椂闂�
+ }
+ if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()) {
+ //濡傛灉鏄渶鍚庝竴閬撳伐搴忔姤宸ヤ箣鍚庣敓浜ц鍗曞畬鎴愭暟閲�+
+ productOrder.setCompleteQuantity(productOrder.getCompleteQuantity().add(productQty));
+ if (productOrder.getCompleteQuantity().compareTo(productOrder.getQuantity()) == 0) {
+ productOrder.setEndTime(LocalDateTime.now());//缁撴潫鏃堕棿
+ }
+ }
+ productOrderMapper.updateById(productOrder);
+ /*娣诲姞鐢熶骇鏍哥畻*/
+ SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
+ .salesLedgerWorkId(productionProductMain.getId())
+ .salesLedgerSchedulingId(0L)
+ .salesLedgerId(productOrder.getSalesLedgerId())
+ .salesLedgerProductId(productOrder.getProductModelId())
+ .schedulingUserId(user.getUserId())
+ .schedulingUserName(user.getNickName())
+ .finishedNum(productQty)
+ .workHours(productProcess.getSalaryQuota())
+ .process(productProcess.getName())
+ .schedulingDate(LocalDate.now())
+ .tenantId(dto.getTenantId())
+ .build();
+ salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting);
}
- productOrderMapper.updateById(productOrder);
- /*娣诲姞鐢熶骇鏍哥畻*/
- SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
- .salesLedgerWorkId(productionProductMain.getId())
- .salesLedgerSchedulingId(0L)
- .salesLedgerId(productOrder.getSalesLedgerId())
- .salesLedgerProductId(productOrder.getProductModelId())
- .schedulingUserId(user.getUserId())
- .schedulingUserName(user.getNickName())
- .finishedNum(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO)
- .workHours(productProcess.getSalaryQuota())
- .process(productProcess.getName())
- .schedulingDate(LocalDate.now())
- .tenantId(dto.getTenantId())
- .build();
- salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting);
+ //濡傛灉鎶ュ簾鏁伴噺>0,闇�瑕佽繘鍏ユ姤搴熺殑搴撳瓨
return true;
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index 0c6fa02..4428405 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -16,13 +16,13 @@
import java.util.List;
@RestController
-@Api(tags = "閲囪喘鍏ュ簱")
+@Api(tags = "鍏ュ簱")
@RequestMapping("/stockInRecord")
public class StockInRecordController {
@Autowired
private StockInRecordService stockInRecordService;
- @GetMapping("/listPageByProduction")
+ @GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍏ュ簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index bf8a619..df82379 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -7,6 +7,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.service.StockOutRecordService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -22,13 +23,14 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-21 05:27:04
*/
+@Api(tags = "鍑哄簱")
@RestController
@RequestMapping("/stockOutRecord")
public class StockOutRecordController {
@Autowired
private StockOutRecordService stockOutRecordService;
- @GetMapping("/listPageByProduction")
+ @GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 2ac682c..5419ced 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -3,6 +3,7 @@
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+
@Data
public class StockInRecordDto extends StockInRecord {
/**
@@ -17,4 +18,6 @@
* 浜у搧鍗曚綅
*/
private String unit;
+
+ private String timeStr;
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 6c9d455..e288256 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -1,7 +1,13 @@
package com.ruoyi.stock.dto;
import com.ruoyi.stock.pojo.StockOutRecord;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class StockOutRecordDto extends StockOutRecord {
/**
* 浜у搧鍚嶇О
diff --git a/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml b/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml
index 36ce60d..5003a8d 100644
--- a/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml
@@ -17,7 +17,7 @@
sjlr.phone,
scp.create_time
FROM staff_contacts_personal scp
- LEFT JOIN (select * from staff_join_leave_record WHERE staff_state = 1) sjlr ON scp.contact_id=sjlr.id
+ LEFT JOIN (select * from staff_on_job WHERE staff_state = 1) sjlr ON scp.contact_id=sjlr.id
where 1=1
<if test="staffContactsPersonalDTO.staffName != null and staffContactsPersonalDTO.staffName != ''">
and sjlr.staff_name like concat('%',#{staffContactsPersonalDTO.staffName},'%')
diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index 81cf11d..5d447e1 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -10,7 +10,7 @@
t3.dict_label as dictName,
t4.dict_label as dictTypeName
from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
+ left join staff_on_job t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
<where>
@@ -45,7 +45,7 @@
t3.dict_label as dictName,
t4.dict_label as dictTypeName
from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
+ left join staff_on_job t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
<where>
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 11cd348..5c64617 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -20,6 +20,7 @@
p.product_name as productName,
pm.model as productModelName,
ppo.quantity,
+ ppo.scrap_qty,
pm.unit,
sl.sales_contract_no salesContractNo
from
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index b5baf13..c5a99f9 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -27,7 +27,7 @@
sl.customer_name,
sl.contract_amount
ORDER BY
- sl.sales_contract_no;
+ sl.sales_contract_no
</select>
<select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
select *
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index b4f31dc..8064b7b 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -4,12 +4,13 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
SELECT
- sir.*
- pm.product_name as productName,
+ sir.*,
+ p.product_name as productName,
pm.model,
pm.unit
FROM stock_in_record as sir
- LEFT JOIN product_models as pm on sir.product_model_id = pm.id
+ LEFT JOIN product_model as pm on sir.product_model_id = pm.id
+ LEFT JOIN product as p on pm.product_id = p.id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{param.timeStr},'%')
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index ea8e9f9..369e28f 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -20,12 +20,13 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
SELECT
- sor.*
- pm.product_name as productName,
+ sor.*,
+ p.product_name as productName,
pm.model,
pm.unit
FROM stock_out_record as sor
- LEFT JOIN product_models as pm on sor.product_model_id = pm.id
+ LEFT JOIN product_model as pm on sor.product_model_id = pm.id
+ LEFT JOIN product as p on pm.product_id = p.id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{param.timeStr},'%')
--
Gitblit v1.9.3