完善代码

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

@@ -64,6 +64,29 @@ public class BaseProductClassController extends JeecgController<BaseProductClass
         return Result.OK(pageList);
     }
 
+    /**
+     * 分页列表查询
+     *
+     * @param baseProductClass
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "产品分类-分页列表查询")
+    @ApiOperation(value = "产品分类-分页列表查询", notes = "产品分类-分页列表查询")
+    @GetMapping(value = "/listNoChild")
+    public Result<IPage<BaseProductClass>> listNoChild(BaseProductClass baseProductClass,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        QueryWrapper<BaseProductClass> queryWrapper = QueryGenerator.initQueryWrapper(baseProductClass, req.getParameterMap());
+        Page<BaseProductClass> page = new Page<BaseProductClass>(pageNo, pageSize);
+        queryWrapper.isNull("parent_id");
+        IPage<BaseProductClass> pageList = baseProductClassService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *
@@ -142,6 +165,16 @@ public class BaseProductClassController extends JeecgController<BaseProductClass
     @RequiresPermissions("baseCode:base_product_class:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+
+        QueryWrapper<BaseProductClass> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("parent_id", id);
+        queryWrapper.eq("del_flag", "0");
+
+        List<BaseProductClass> list = baseProductClassService.list(queryWrapper);
+        if (list.size() != 0) {
+            return Result.error("请先删除下级分类！");
+        }
+
         baseProductClassService.removeById(id);
         return Result.OK("删除成功!");
     }
@@ -157,6 +190,20 @@ public class BaseProductClassController extends JeecgController<BaseProductClass
     @RequiresPermissions("baseCode:base_product_class:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        for(String id:ids.split(",")){
+
+            QueryWrapper<BaseProductClass> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("parent_id", id);
+            queryWrapper.eq("del_flag", "0");
+
+            List<BaseProductClass> list = baseProductClassService.list(queryWrapper);
+            if (list.size() != 0) {
+                return Result.error("请先删除下级分类！");
+            }
+
+        }
+
         this.baseProductClassService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
@@ -196,10 +243,6 @@ public class BaseProductClassController extends JeecgController<BaseProductClass
 
         List<BaseProductClass> list = baseProductClassService.list(queryWrapper);
 
-        if(list.size() == 0){
-
-            return Result.error("数据为空");
-        }
         return Result.OK(list);
     }
 

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurInquiryFormController.java

@@ -379,6 +379,7 @@ public class PurInquiryFormController {
                         a.setSourceCode(o.getBillCode());
                         a.setSourceId(a.getId());
                         a.setSourceId2(o.getId());
+                        a.setSourceId3(o.getChildId());
                         a.setCurrency(o.getCurrency());
                         a.setDeliveryDayChild(o.getDeliveryDayChild());
                         a.setQualityGrade(o.getQualityGrade());
@@ -386,6 +387,7 @@ public class PurInquiryFormController {
                         a.setTaxPriceUsd(o.getTaxPriceUsd());
                         a.setTaxAmountUsd(o.getTaxAmountUsd());
                         a.setExchangeRateUsd(o.getExchangeRateUsd());
+                        a.setNotes(o.getNotes());
                     }
 
                 }

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

@@ -148,9 +148,11 @@ public class PurInquiryFormProduct implements Serializable {
     @TableField(exist = false)
     private String currency;//币种
     @TableField(exist = false)
-    private String sourceId2;//来源单号
+    private String sourceId2;//来源单号(供应商报价单 主表id)
     @TableField(exist = false)
-    private String sourceCode;//来源单号
+    private String sourceId3;//来源单号(供应商报价单 子表id)
+    @TableField(exist = false)
+    private String sourceCode;
     @TableField(exist = false)
     private String selectionSupplier;//选定供应商
     @TableField(exist = false)

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

@@ -160,9 +160,10 @@ public class PurQuotationSelectionProduct implements Serializable {
     @ApiModelProperty(value = "币种")
     private String currency;
 
-    private String sourceCode;
-    private String sourceId;//供应商询价
-    private String sourceId2;//供应商报价
+    private String sourceCode;//供应商询价单号
+    private String sourceId;//供应商询价 来源(供应商询价单 子表id)
+    private String sourceId2;//供应商报价 来源(供应商报价单 主表id)
+    private String sourceId3;//供应商报价 来源(供应商报价单 子表id)
 
     @Excel(name = "交期", width = 15)
     private String deliveryDayChild;//交期（天数）

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurQuotationSelectionServiceImpl.java

@@ -2,10 +2,7 @@ package org.jeecg.modules.purCode.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.micrometer.core.instrument.util.StringUtils;
-import org.jeecg.modules.purCode.entity.PurInquiryForm;
-import org.jeecg.modules.purCode.entity.PurQuotationSelection;
-import org.jeecg.modules.purCode.entity.PurQuotationSelectionShip;
-import org.jeecg.modules.purCode.entity.PurQuotationSelectionProduct;
+import org.jeecg.modules.purCode.entity.*;
 import org.jeecg.modules.purCode.mapper.*;
 import org.jeecg.modules.purCode.service.IPurQuotationSelectionService;
 import org.jeecg.modules.saleCode.mapper.SaleInquiryFormMapper;
@@ -63,7 +60,7 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveMain(PurQuotationSelection purQuotationSelection, List<PurQuotationSelectionShip> purQuotationSelectionShipList, List<PurQuotationSelectionProduct> purQuotationSelectionProductList) {
-        String sourceId = purQuotationSelection.getSourceId();
+        String sourceId = purQuotationSelection.getSourceId();//该记录 为询价单单号合集 以逗号分割
         if(StringUtils.isNotBlank(sourceId)){
 
             String deduplicated = Arrays.stream(sourceId.split(","))
@@ -74,6 +71,18 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
             sourceId = deduplicated;
         }
 
+        if (purQuotationSelectionProductList != null && purQuotationSelectionProductList.size() > 0) {
+
+            String queryId = purQuotationSelectionProductList.get(0).getSourceId2();//报价单主表主键
+            if(StringUtils.isNotBlank(queryId)){
+
+                PurPurchaseQuotation ent = purPurchaseQuotationMapper.selectById(queryId);
+                if(ent !=null){
+                    purQuotationSelection.setSysOrgCode(ent.getSysOrgCode());
+                }
+            }
+        }
+
         purQuotationSelectionMapper.insert(purQuotationSelection);
         if (purQuotationSelectionShipList != null && purQuotationSelectionShipList.size() > 0) {
             for (PurQuotationSelectionShip entity : purQuotationSelectionShipList) {
@@ -84,6 +93,7 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
             }
         }
         if (purQuotationSelectionProductList != null && purQuotationSelectionProductList.size() > 0) {
+
             for (PurQuotationSelectionProduct entity : purQuotationSelectionProductList) {
                 //外键设置
                 entity.setId(null);
@@ -151,6 +161,18 @@ public class PurQuotationSelectionServiceImpl extends ServiceImpl<PurQuotationSe
 //            }
 //        }
 
+        if (purQuotationSelectionProductList != null && purQuotationSelectionProductList.size() > 0) {
+
+            String queryId = purQuotationSelectionProductList.get(0).getSourceId2();//报价单主表主键
+            if(StringUtils.isNotBlank(queryId)){
+
+                PurPurchaseQuotation ent = purPurchaseQuotationMapper.selectById(queryId);
+                if(ent !=null){
+                    purQuotationSelection.setSysOrgCode(ent.getSysOrgCode());
+                }
+            }
+        }
+
         purQuotationSelectionMapper.updateById(purQuotationSelection);
 
         //1.先删除子表数据

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInquiryFormController.java

@@ -88,12 +88,37 @@ public class SaleInquiryFormController {
     //@AutoLog(value = "销售询价单-分页列表查询")
     @ApiOperation(value = "销售询价单-分页列表查询", notes = "销售询价单-分页列表查询")
     @GetMapping(value = "/list")
-    @PermissionData(pageComponent="saleCode/saleInquiryForm/SaleInquiryFormList")
+    @PermissionData(pageComponent = "saleCode/saleInquiryForm/SaleInquiryFormList")
     public Result<IPage<SaleInquiryForm>> queryPageList(SaleInquiryForm saleInquiryForm,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                         HttpServletRequest req) {
+
+        String shipName = saleInquiryForm.getShipName();
+//        String imo = saleInquiryForm.getImo();
+
+        QueryWrapper<SaleInquiryFormShip> shipQueryWrapper = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(shipName)){
+            shipQueryWrapper.eq("ship_name", shipName);
+            saleInquiryForm.setShipName(null);
+        }
+//        if(StringUtils.isNotBlank(imo)){
+//
+//            shipQueryWrapper.eq("imo", imo);
+//            saleInquiryForm.setImo(null);
+//        }
+
         QueryWrapper<SaleInquiryForm> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, req.getParameterMap());
+
+        if(StringUtils.isNotBlank(shipName)){
+
+            List<SaleInquiryFormShip> list = saleInquiryFormShipService.list(shipQueryWrapper);
+            if (list.size() > 0) {
+                String[] headId = list.stream().map(SaleInquiryFormShip::getHeadId).toArray(String[]::new);
+                queryWrapper.in("id", headId);
+            }
+
+        }
         Page<SaleInquiryForm> page = new Page<SaleInquiryForm>(pageNo, pageSize);
         IPage<SaleInquiryForm> pageList = saleInquiryFormService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -117,14 +142,13 @@ public class SaleInquiryFormController {
                                                                     HttpServletRequest req) {
 
 
-
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        if(!sysUser.getUsername().equals("admin")){
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!sysUser.getUsername().equals("admin")) {
 
             String orgCode = sysUser.getOrgCode();
-            if(StringUtils.isNotBlank(orgCode)){
+            if (StringUtils.isNotBlank(orgCode)) {
                 SysDepart dept = sysDepartService.queryDeptByCode(orgCode);
-                if(dept != null){
+                if (dept != null) {
                     saleInquiryForm.setInquiryTeam(dept.getId());
                 }
             }
@@ -344,7 +368,7 @@ public class SaleInquiryFormController {
             Integer status = o.getStatus();
             String code = o.getBillCode();
 
-            if(status != null && status != 0){
+            if (status != null && status != 0) {
                 sb.append("单号" + code).append("已报价，请勿取消提交；");
                 continue;
             }
@@ -357,10 +381,10 @@ public class SaleInquiryFormController {
             queryPurInquiryForm.eq("del_flag", "0");
 
             List<PurInquiryForm> listPurInquiryForm = purInquiryFormService.list(queryPurInquiryForm);
-            if(listPurInquiryForm.size() > 0){
+            if (listPurInquiryForm.size() > 0) {
                 List<String> codeList = listPurInquiryForm.stream().map(PurInquiryForm::getBillCode).collect(Collectors.toList());
                 String codes = StringUtils.join(codeList.toArray(), ",");
-                sb.append("单号" + code).append("已被供应商询价单使用，请勿取消提交"+codes+"；");
+                sb.append("单号" + code).append("已被供应商询价单使用，请勿取消提交" + codes + "；");
                 continue;
             }
 

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryForm.java

@@ -3,10 +3,8 @@ package org.jeecg.modules.saleCode.entity;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
@@ -171,4 +169,11 @@ public class SaleInquiryForm implements Serializable {
     private String inquiryNotes;
 	//质量等级
     private String qualityGradeHead;
+
+    //子表查询所用
+    @TableField(exist = false)
+    private String shipName;//船名
+//    @TableField(exist = false)
+//    private String imo;//imo号
+
 }

srm-module-code/src/main/java/org/jeecg/modules/storeCode/controller/StoreOnhandController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.storeCode.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -75,8 +76,19 @@ public class StoreOnhandController extends JeecgController<StoreOnhand, IStoreOn
                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     HttpServletRequest req) {
+
+
+        BigDecimal keyspace = BigDecimal.ZERO;
+        if(storeOnhand.getQuantity() !=null){
+            keyspace = storeOnhand.getQuantity();
+        }
+        storeOnhand.setQuantity(null);
         QueryWrapper<StoreOnhand> queryWrapper = QueryGenerator.initQueryWrapper(storeOnhand, req.getParameterMap());
         Page<StoreOnhand> page = new Page<StoreOnhand>(pageNo, pageSize);
+
+        if(keyspace.compareTo(BigDecimal.ZERO) !=0 ){
+            queryWrapper.gt("quantity",0);
+        }
         IPage<StoreOnhand> pageList = storeOnhandService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

srm-module-code/src/main/java/org/jeecg/modules/storeCode/service/impl/StoreOnhandServiceImpl.java

@@ -105,7 +105,7 @@ public class StoreOnhandServiceImpl extends ServiceImpl<StoreOnhandMapper, Store
             return "true";
 
         } catch (Exception e) {
-            throw new JeecgBootException(sourceType +sourceCode+ "产品：" + id + "执行异常");
+            throw new JeecgBootException("出库执行异常"+e.getMessage());
         }
     }