采购添加 运费 优惠 附件

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/dto/PurchaseDto.java

@@ -1,12 +1,11 @@
 package com.fjhx.purchase.entity.purchase.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
-import com.fjhx.purchase.entity.purchase.po.PurchasePayRecordDetail;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,4 +49,9 @@ public class PurchaseDto extends Purchase {
      */
     private String paidCurrency;
 
+    /**
+     * 附件信息
+     */
+    private List<ObsFile> fileList;
+
 }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlowByWdly.java

@@ -10,8 +10,10 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.core.FlowThreadLocalUtil;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
@@ -77,13 +79,16 @@ public class PurchaseFlowByWdly extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
         DynamicDataSourceContextHolder.push(SourceConstant.PURCHASE);
         try {
-            Purchase purchase = submitData.toJavaObject(Purchase.class);
+            PurchaseDto purchase = submitData.toJavaObject(PurchaseDto.class);
 //            purchase.setCode(CodeEnum.PURCHASE.getCode());
             purchase.setCode(codingRuleService.createCode(CodingRuleEnum.PURCHASE.getKey(), null));
             purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
             purchase.setProcessInstanceId("wdly_purchase");
             purchase.setFlowId(flowId);
             purchaseService.save(purchase);
+            //处理附件信息
+            ObsFileUtil.saveFile(purchase.getFileList(), purchase.getId());
+
             List<PurchaseDetail> purchaseDetailList = purchase.getPurchaseDetailList();
             if (CollectionUtils.isNotEmpty(purchaseDetailList)) {
                 for (PurchaseDetail s : purchaseDetailList) {
@@ -211,10 +216,13 @@ public class PurchaseFlowByWdly extends FlowDelegate {
             //获取提交的数据
             JSONObject submitData = FlowThreadLocalUtil.getCurrentData();
             //修改采购信息
-            Purchase purchase = submitData.toJavaObject(Purchase.class);
+            PurchaseDto purchase = submitData.toJavaObject(PurchaseDto.class);
             Assert.notEmpty(purchase.getId(), "采购id不能为空");
             purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
             purchaseService.updateById(purchase);
+            //处理附件信息
+            ObsFileUtil.editFile(purchase.getFileList(), purchase.getId());
+
             //修改采购明细
             List<PurchaseDetail> purchaseDetailList = purchase.getPurchaseDetailList();
             if (CollectionUtils.isNotEmpty(purchaseDetailList)) {

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -333,7 +333,12 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                         q -> q.in(StockWaitDetails::getBusinessDetailsId, pbdIds));
                 for (PurchaseBackDetailsVo purchaseBackDetailsVo : purchaseBackDetailsVos) {
                     StockWaitDetails stockWaitDetails = stockWaitDetailsMap.get(purchaseBackDetailsVo.getId());
-                    purchaseBackDetailsVo.setReturnedQuantity(stockWaitDetails.getReceiptQuantity());
+                    BigDecimal returnedQuantity = BigDecimal.ZERO;
+                    if (ObjectUtil.isNotEmpty(stockWaitDetails)) {
+                        returnedQuantity = stockWaitDetails.getReceiptQuantity();
+                    }
+                    purchaseBackDetailsVo.setReturnedQuantity(returnedQuantity);
+
                 }
 
                 purchaseDetailVo.setPurchaseBackDetailsList(purchaseBackDetailsVos);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -67,6 +67,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     public Page<StockVo> getPage(StockSelectDto dto) {
         IWrapper<Stock> wrapper = getWrapper();
+        wrapper.orderByDesc("s", Stock::getId);
         wrapper.eq(Stock::getWarehouseId, dto.getId());
 //        wrapper.like(Stock::getQuantity, dto.getKeyword());
         String keyword = dto.getKeyword();
@@ -79,12 +80,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         wrapper.in(Stock::getProductId, dto.getProductIds());
         wrapper.eq("pi.definition", dto.getDefinition());
 
-        //库存查询排序 按 可用库存，冻结库存，次品库存，最后入库时间 排序
-        wrapper.orderByDesc("s.quantity");
-        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.frozenQuantity' )");
-        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' )");
-        wrapper.orderByDesc("s.update_time");
-
         Page<StockVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();
         //赋值产品信息
@@ -190,6 +185,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     public Page<StockVo> pageByProduct(StockSelectDto dto) {
         IWrapper<Stock> wrapper = getWrapper();
+        wrapper.orderByDesc("s", Stock::getId);
         wrapper.eq(Stock::getWarehouseId, dto.getId());
 //        wrapper.like(Stock::getQuantity, dto.getKeyword());
         String keyword = dto.getKeyword();
@@ -201,13 +197,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         }
         wrapper.eq("pi.definition", dto.getDefinition());
         wrapper.groupBy("s.product_id");
-
-        //库存查询排序 按 可用库存，冻结库存，次品库存，最后入库时间 排序
-        wrapper.orderByDesc("s.quantity");
-        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.frozenQuantity' )");
-        wrapper.orderByDesc("json_unquote( s.victoriatourist_json -> '$.defectiveQuantity' )");
-        wrapper.orderByDesc("s.update_time");
-
         Page<StockVo> page = this.baseMapper.pageByProduct(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();