完善代码

srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProjectArchiveController.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.purCode.entity.PurDeliveryNote;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -159,6 +160,55 @@ public class BaseProjectArchiveController extends JeecgController<BaseProjectArc
         return Result.OK("批量删除成功!");
     }
 
+
+    /**
+     * 批量停用
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "项目档案-批量停用")
+    @ApiOperation(value = "项目档案-批量停用", notes = "项目档案-批量停用")
+    @GetMapping(value = "/submitClose")
+    public Result<String> submitClose(@RequestParam(name = "ids", required = true) String ids,String closeReason) {
+
+        QueryWrapper<BaseProjectArchive> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", Arrays.asList(ids.split(",")));
+
+        List<BaseProjectArchive> list = baseProjectArchiveService.list(queryWrapper);
+        if (list.size() == 0) {
+            return Result.error("数据为空！");
+        }
+
+        StringBuffer sb = new StringBuffer();
+        for (BaseProjectArchive o : list) {
+
+            String code = o.getCode();
+
+            //关闭(close)1是0否
+            Integer getClose = o.getStatus();
+
+            if (getClose !=null && getClose == 0) {
+                sb.append("编号" + code).append("已停用，无需再次操作；");
+                continue;
+            }
+        }
+
+        if (StringUtils.isNotBlank(sb.toString())) {
+
+            return Result.error(sb.toString());
+        }
+
+        BaseProjectArchive ent = new BaseProjectArchive();
+        ent.setStatus(0);
+        ent.setCloseReason(closeReason);
+        baseProjectArchiveService.update(ent, queryWrapper);
+
+        return Result.OK("停用成功！");
+    }
+
+
+
     /**
      * 通过id查询
      *

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionProduct.java

@@ -174,4 +174,8 @@ public class PurQuotationSelectionProduct implements Serializable {
     private java.math.BigDecimal taxAmountUsd;
     @ApiModelProperty(value = "美元汇率")
     private java.math.BigDecimal exchangeRateUsd;
+    //含税单价（原价）
+    private java.math.BigDecimal taxPriceOriginal;
+    //含税金额（原价）
+    private java.math.BigDecimal taxAmountOriginal;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleContractServiceImpl.java

@@ -87,8 +87,8 @@ public class SaleContractServiceImpl extends ServiceImpl<SaleContractMapper, Sal
 		saleContractMapper.updateById(saleContract);
 
 		//1.先删除子表数据
-		saleContractShipMapper.deleteByMainId(saleContract.getId());
-		saleContractProductMapper.deleteByMainId(saleContract.getId());
+//		saleContractShipMapper.deleteByMainId(saleContract.getId());
+//		saleContractProductMapper.deleteByMainId(saleContract.getId());
 
 		//2.子表数据重新插入
 		if(saleContractShipList!=null && saleContractShipList.size()>0) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleOrderServiceImpl.java

@@ -193,8 +193,8 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
 		saleOrderMapper.updateById(saleOrder);
 
 		//1.先删除子表数据
-		saleOrderShipMapper.deleteByMainId(saleOrder.getId());
-		saleOrderProductMapper.deleteByMainId(saleOrder.getId());
+//		saleOrderShipMapper.deleteByMainId(saleOrder.getId());
+//		saleOrderProductMapper.deleteByMainId(saleOrder.getId());
 
 		//2.子表数据重新插入
 		if(saleOrderShipList!=null && saleOrderShipList.size()>0) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleQuotationServiceImpl.java

@@ -141,8 +141,8 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 		saleQuotationMapper.updateById(saleQuotation);
 
 		//1.先删除子表数据
-		saleQuotationShipMapper.deleteByMainId(saleQuotation.getId());
-		saleQuotationProductMapper.deleteByMainId(saleQuotation.getId());
+//		saleQuotationShipMapper.deleteByMainId(saleQuotation.getId());
+//		saleQuotationProductMapper.deleteByMainId(saleQuotation.getId());
 
 		//2.子表数据重新插入
 		if(saleQuotationShipList!=null && saleQuotationShipList.size()>0) {