代码补充

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -83,6 +83,8 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
      */
 	public String queryDictTextByKey(@Param("code") String code,@Param("key") String key);
 
+	public String queryDescriptionByKey(@Param("code") String code);
+
 	/**
 	 * 可通过多个字典code查询翻译文本
 	 * @param dictCodeList 多个字典code

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -55,6 +55,11 @@
 		   and s.item_value = #{key}
 	</select>
 
+	<!-- 通过字典code获取字典数据 -->
+	<select id="queryDescriptionByKey" parameterType="String"  resultType="String">
+		   select description from sys_dict where dict_code = #{code} and del_flag = 0
+	</select>
+
 	<!-- 通过字典code获取字典数据，可批量查询 -->
 	<select id="queryManyDictByKeys" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModelMany">
 		SELECT

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java

@@ -94,6 +94,7 @@ public interface ISysDictService extends IService<SysDict> {
      */
     public String queryDictTextByKey(String code, String key);
 
+	public String queryDescriptionByKey(String code);
 	/**
 	 * 可通过多个字典code查询翻译文本
 	 * @param dictCodeList 多个字典code

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -74,6 +74,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	@Autowired
 	private RedisUtil redisUtil;
 
+	@Override
+	public String queryDescriptionByKey(String code){
+		return sysDictMapper.queryDescriptionByKey(code);
+	}
 	@Override
 	public String queryAgreementTermsByName(String name){
 		return sysDictMapper.queryAgreementTermsByName(name);

srm-module-code/src/main/java/org/jeecg/modules/afterCode/vo/AfterComplaintPage.java

@@ -131,6 +131,10 @@ public class AfterComplaintPage {
 	@Excel(name = "投诉原因(reason)", width = 15)
 	@ApiModelProperty(value = "投诉原因(reason)")
     private String reason;
+	/**投诉原因(reason)*/
+	@Excel(name = "投诉原因(reason)", width = 15)
+	@ApiModelProperty(value = "投诉原因(reason)")
+	private String reason1;
 	/**处理(deal)*/
 	@Excel(name = "处理(deal)", width = 15)
 	@ApiModelProperty(value = "处理(deal)")

srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/SerialPatternServiceImpl.java

@@ -77,7 +77,7 @@ public class SerialPatternServiceImpl extends ServiceImpl<SerialPatternMapper, S
             QueryWrapper<Map<String,String>> queryWrapper = new QueryWrapper<>();
             if(StringUtils.isNotBlank(prefix)){
 //                if("sale_invoice".equals(tableName)){
-//                    dateStr = "2501";
+//                    dateStr = "25";
 //                }
                 queryWrapper.likeRight(fieldName,prefix+dateStr);
             }

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

@@ -436,6 +436,7 @@ public class PurInquiryFormController {
                         a.setSourceId(a.getId());
                         a.setSourceId2(o.getId());
                         a.setSourceId3(o.getChildId());
+                        a.setSourceId4(sourceId);
                         a.setCurrency(o.getCurrency());
                         a.setDeliveryDayChild(o.getDeliveryDayChild());
                         a.setQualityGrade(o.getQualityGrade());

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

@@ -208,6 +208,24 @@ public class PurPurchaseQuotationController {
     }
 
     public static void main(String[] args) {
+
+        String a = "1";
+        String b = "1";
+        String c = "2";
+        String d = "2";
+        String e = "32";
+        String h = "3";
+
+        if(a.equals(b) && d.equals(c) && e.equals(h)){
+            System.out.println("111111");
+        }else if(a.equals(b) && d.equals(c)){
+
+            System.out.println("222222");
+        }else{
+
+            System.out.println("rrrrrrrrr");
+        }
+
         // 获取当前日期
         Date date = new Date();
         int year = date.getYear() + 1900;

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

@@ -258,7 +258,7 @@ public class PurQuotationSelectionController {
         return Result.OK(PurOrderPage);
     }
 
-    public static void main(String[] args) {
+    public static void mai1n(String[] args) {
 
 
         List<String> list = new ArrayList<String>();
@@ -469,6 +469,20 @@ public class PurQuotationSelectionController {
 
         List<String> listId = new ArrayList<>();
 
+        BigDecimal checkQuotaBig = new BigDecimal("2000");
+
+        try {
+
+            String checkQuota = sysDictService.queryDescriptionByKey("check_quota");
+
+            if(StringUtils.isNotBlank(checkQuota)){
+                checkQuotaBig = new BigDecimal(checkQuota);
+            }
+
+        }catch (Exception e){
+
+        }
+
         StringBuffer sb = new StringBuffer();
         for (PurQuotationSelection o : list) {
             //提交(1-是 ，0-否)
@@ -482,7 +496,8 @@ public class PurQuotationSelectionController {
 
             BigDecimal totalAmountUsd = o.getTotalAmountUsd() == null ? BigDecimal.ZERO : o.getTotalAmountUsd();
             String id = o.getId();
-            if(totalAmountUsd.compareTo(new BigDecimal("2000")) >= 0 ){
+//            if(totalAmountUsd.compareTo(new BigDecimal("2000")) >= 0 ){
+            if(totalAmountUsd.compareTo(checkQuotaBig) >= 0 ){
                 listId.add(id);
             }
 
@@ -497,26 +512,57 @@ public class PurQuotationSelectionController {
         ent.setSubmit("1");
         purQuotationSelectionService.update(ent, queryWrapper);
 
-        if(listId.size() > 0){
-
-            String active = getActiveProfile();
-            if(StringUtils.isNotBlank(active) && (active.equals("prod") || active.equals("dev"))){
-
-                QueryWrapper<PurQuotationSelection> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.in("id",listId);
-                PurQuotationSelection ent2 = new PurQuotationSelection();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        if(StringUtils.isNotBlank(sysUser.getOrgCode()) &&
+//                (sysUser.getUsername().equals("admin")||
+//                sysUser.getOrgCode().equals("A02A03")||
+//                sysUser.getOrgCode().equals("A02A03A01")||
+//                sysUser.getOrgCode().equals("A02A03A02")||
+//                sysUser.getOrgCode().equals("A02A03A03")||
+//                sysUser.getOrgCode().equals("A02A03A04")||
+//                sysUser.getOrgCode().equals("A02A03A05")||
+//                sysUser.getOrgCode().equals("A02A03A06")||
+//                sysUser.getOrgCode().equals("A02A03A07"))) {
+        if(StringUtils.isNotBlank(sysUser.getOrgCode()) &&
+                (sysUser.getUsername().equals("admin")||
+                        sysUser.getOrgCode().indexOf("A02A03") != -1)) {
+
+            if(listId.size() > 0){
+
+                String active = getActiveProfile();
+                if(StringUtils.isNotBlank(active) && (active.equals("prod") || active.equals("dev"))){
+
+                    QueryWrapper<PurQuotationSelection> queryWrapper2 = new QueryWrapper<>();
+                    queryWrapper2.in("id",listId);
+                    PurQuotationSelection ent2 = new PurQuotationSelection();
 //              提交(1是 0否 2待审核)
-                ent2.setSubmit("2");
-                purQuotationSelectionService.update(ent2, queryWrapper2);
+                    ent2.setSubmit("2");
+                    purQuotationSelectionService.update(ent2, queryWrapper2);
+
+                    return Result.OK("提交成功（本单报价金额超过"+checkQuotaBig+"美金，需上级审批）！");
+                }
 
-                return Result.OK("提交成功（本单报价金额超过2000美金，需上级审批）！");
             }
 
         }
 
+
         return Result.OK("提交成功！");
     }
 
+        public static void main(String[] args) {
+            String str = "A02A03";
+            String toFind = "A02A03";
+
+            // 使用 indexOf() 方法查找子串
+            int index = str.indexOf(toFind);
+
+            if (index != -1) {
+                System.out.println("找到子串 '" + toFind + "'，起始索引为: " + index);
+            } else {
+                System.out.println("未找到子串 '" + toFind + "'");
+            }
+        }
 
 
     /**

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

@@ -155,6 +155,8 @@ public class PurInquiryFormProduct implements Serializable {
     @TableField(exist = false)
     private String sourceId3;//来源单号(供应商报价单 子表id)
     @TableField(exist = false)
+    private String sourceId4;//来源单号(销售询价 子表id)
+    @TableField(exist = false)
     private String sourceCode;
     @TableField(exist = false)
     private String selectionSupplier;//选定供应商

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

@@ -184,4 +184,6 @@ public class PurPurchaseQuotation implements Serializable {
     private String qualityGradeHead;
     //协议条款（表尾备注）
     private String agreementTerms;
+    //类型（正常报价，异常报价，拒绝报价）
+    private String quotationType;
 }

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

@@ -132,4 +132,6 @@ public class PurQuotationSelection implements Serializable {
     @ApiModelProperty(value = "审批时间")
     private Date approvalTime;
 
+    //类型（正常报价，异常报价，拒绝报价）
+    private String quotationType;
 }

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

@@ -166,6 +166,7 @@ public class PurQuotationSelectionProduct implements Serializable {
     private String sourceId;//供应商询价 来源(供应商询价单 子表id)
     private String sourceId2;//供应商报价 来源(供应商报价单 主表id)
     private String sourceId3;//供应商报价 来源(供应商报价单 子表id)
+    private String sourceId4;//来源单号(销售询价 子表id)
 
     @Excel(name = "交期", width = 15)
     private String deliveryDayChild;//交期（天数）

srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/xml/PurPurchaseQuotationMapper.xml

@@ -11,10 +11,11 @@
 
     <select id="selectHisByInfo" parameterType="java.lang.String" resultType="org.jeecg.modules.purCode.entity.PurPurchaseQuotation">
 
-        select b.project_name , a.tax_price total_amount,b.bill_date from pur_purchase_quotation_product a
+        select b.project_name , a.tax_price total_amount,b.bill_date,b.suppiler_name from pur_purchase_quotation_product a
         left join pur_purchase_quotation b on a.head_id = b.id
 
-        where b.quotation_suppiler=#{quotationSuppiler} and a.product_id=#{productId} order by b.bill_date desc
+        where <!-- b.quotation_suppiler=#{quotationSuppiler} and-->
+              a.product_id=#{productId} order by b.bill_date desc
 
     </select>
 

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurPurchaseQuotationPage.java

@@ -158,6 +158,8 @@ public class PurPurchaseQuotationPage {
 	@ApiModelProperty(value = "来源单号（采购报价单）")
 	private String sourceCode;
 
+	//类型（正常报价，异常报价，拒绝报价）
+	private String quotationType;
 	//质量等级
 	private String qualityGradeHead;
 	//协议条款（表尾备注）

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionPage.java

@@ -114,6 +114,9 @@ public class PurQuotationSelectionPage {
 	//质量等级
 	private String qualityGradeHead;
 
+	//类型（正常报价，异常报价，拒绝报价）
+	private String quotationType;
+
 	@ExcelCollection(name="采购报价选定子表 - 船明细")
 	@ApiModelProperty(value = "采购报价选定子表 - 船明细")
 	private List<PurQuotationSelectionShip> purQuotationSelectionShipList;

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

@@ -138,7 +138,21 @@ public class SaleDeliveryController {
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
+
+
         QueryWrapper<SaleDelivery> queryWrapper = QueryGenerator.initQueryWrapper(saleDelivery, req.getParameterMap());
+        if(StringUtils.isNotBlank(saleDelivery.getOrderNumber())){
+            QueryWrapper saleQW = new QueryWrapper();
+            saleQW.like("customer_order",saleDelivery.getOrderNumber());
+            List<SaleOrder> list = saleOrderService.list(saleQW);
+            if(list.size() > 0){
+                List<String> listId = list.stream().map(SaleOrder::getBillCode).collect(Collectors.toList());
+                queryWrapper.in("source_code",listId);
+            }else{
+                return Result.OK(null);
+            }
+
+        }
         Page<SaleDelivery> page = new Page<SaleDelivery>(pageNo, pageSize);
         IPage<SaleDelivery> pageList = saleDeliveryService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -193,8 +207,8 @@ public class SaleDeliveryController {
         QueryWrapper<SaleDelivery> queryWrapper = QueryGenerator.initQueryWrapper(saleDelivery, req.getParameterMap());
         queryWrapper.isNull("invoice_code");//发票号（开发票时回写至此字段）
         queryWrapper.eq("apply_invoice","1");//销售出库单 是否开票申请（1是 0否）
-        queryWrapper.eq("submit","1");//销售出库单 提交(submit)1是0否
-        queryWrapper.eq("close","0");//销售出库单 关闭(close)1是0否
+        queryWrapper.eq("submit","1");// 提交(submit)1是0否
+        queryWrapper.eq("close","0");// 关闭(close)1是0否
         Page<SaleDelivery> page = new Page<SaleDelivery>(pageNo, pageSize);
         IPage<SaleDelivery> pageList = saleDeliveryService.page(page, queryWrapper);
         return Result.OK(pageList);

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

@@ -832,6 +832,7 @@ public class SaleInvoiceController {
         //Step.2 获取导出数据
         List<SaleInvoice> saleInvoiceList = saleInvoiceService.list(queryWrapper);
 
+        System.out.println("============1===============");
         // Step.3 组装pageList
         List<SaleInvoicePage> pageList = new ArrayList<SaleInvoicePage>();
         for (SaleInvoice main : saleInvoiceList) {
@@ -889,6 +890,7 @@ public class SaleInvoiceController {
         mv.addObject(NormalExcelConstants.CLASS, SaleInvoicePage.class);
         mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("销售发票数据", "导出人:" + sysUser.getRealname(), "销售发票"));
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        System.out.println("===========================");
         return mv;
     }
 

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

@@ -417,6 +417,13 @@ public class SaleOrderController {
         }
 
         saleOrder.setVersion("1");
+        if(StringUtils.isNotBlank(saleOrder.getCustomer())){
+
+            CuspCustomerProfile ent = cuspCustomerProfileService.getById(saleOrder.getCustomer());
+            if(ent !=null ){
+                saleOrder.setCustomerName(ent.getName());
+            }
+        }
         saleOrderService.saveMain(saleOrder, saleOrderPage.getSaleOrderShipList(), saleOrderPage.getSaleOrderProductList());
         return Result.OK("添加成功！");
     }
@@ -447,6 +454,13 @@ public class SaleOrderController {
             return Result.error("未找到对应数据");
         }
         saleOrder.setVersion("1");
+        if(StringUtils.isNotBlank(saleOrder.getCustomer())){
+
+            CuspCustomerProfile ent = cuspCustomerProfileService.getById(saleOrder.getCustomer());
+            if(ent !=null ){
+                saleOrder.setCustomerName(ent.getName());
+            }
+        }
         saleOrderService.updateMain(saleOrder, saleOrderPage.getSaleOrderShipList(), saleOrderPage.getSaleOrderProductList());
         return Result.OK("编辑成功!");
     }
@@ -613,10 +627,10 @@ public class SaleOrderController {
 //
 //        }
 
-        Date notDate = DateUtils.strToDate(notified);
+//        Date notDate = DateUtils.strToDate(notified);
 
         SaleOrder ent = new SaleOrder();
-        ent.setNotified(notDate);
+        ent.setNotified(new Date());
         saleOrderService.update(ent, queryWrapper);
 
         return Result.OK("设置通报时间成功!");

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

@@ -151,10 +151,10 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "客户订单号(customer order number)")
     private String customerOrder;
 
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "notified")
-    @Excel(name = "notified", width = 15, format = "yyyy-MM-dd")
+    @Excel(name = "notified", width = 15, format = "yyyy-MM-dd HH:mm:ss")
     private Date notified;
 
 

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

@@ -214,6 +214,8 @@ public class SaleQuotation implements Serializable {
     private String deliveryDayHead;
 
 
+    //类型（正常报价，异常报价，拒绝报价）
+    private String quotationType;
 
     @ApiModelProperty(value = "整单毛利率(gross margin)")
     private java.math.BigDecimal grossMarginHead;

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

@@ -460,16 +460,16 @@ public class SaleInterfaceSyncServiceImpl extends ServiceImpl<SaleInterfaceSyncM
                 //未找到联系人时，新增一个联系人
                 if(listCustomer!=null && listCustomer.size() > 0 && StringUtils.isNotBlank(buyerContactName) && StringUtils.isBlank(contactId)){
 
-                    CuspCustomerProfileMan man = new CuspCustomerProfileMan();
-                    man.setName(buyerContactName);
-                    man.setMobile(buyerTelephone);
-                    man.setEmail(buyerEmail);
-                    man.setPosition(buyerContactJob);
-                    man.setHeadId(listCustomer.get(0).getId());
-                    cuspCustomerProfileManMapper.insert(man);
-
-                    contactName = buyerContactName;
-                    contactId = man.getId();
+//                    CuspCustomerProfileMan man = new CuspCustomerProfileMan();
+//                    man.setName(buyerContactName);
+//                    man.setMobile(buyerTelephone);
+//                    man.setEmail(buyerEmail);
+//                    man.setPosition(buyerContactJob);
+//                    man.setHeadId(listCustomer.get(0).getId());
+//                    cuspCustomerProfileManMapper.insert(man);
+//
+//                    contactName = buyerContactName;
+//                    contactId = man.getId();
                 }
                 saleInquiryForm.setLiaisonId(contactId);//
                 saleInquiryForm.setLiaisonInfo(contactName);//

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleQuotationPage.java

@@ -196,6 +196,8 @@ public class SaleQuotationPage {
 
 	private String shipName;
 	private String imo;
+	//类型（正常报价，异常报价，拒绝报价）
+	private String quotationType;
 
 	private String sourceCode;
 	@ExcelCollection(name="销售报价单-船明细")