صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
chengpan
/
yuncai-scm
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

1:联调接口添加

wangming 2 سال پیش
والد
275a337465
کامیت
1ee3dd2b1a
7فایلهای تغییر یافته به همراه128 افزوده شده و 19 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 10 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/ProductInfoController.java
  2. 1 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/ZSproducController.java
  3. 3 0
      ruoyi-admin/src/main/resources/application-dev.yml
  4. 54 0
      ruoyi-admin/src/main/resources/templates/scm/production/approve.html
  5. 34 16
      ruoyi-admin/src/main/resources/templates/scm/production/production.html
  6. 1 1
      ruoyi-admin/src/main/resources/templates/scm/supplier/supplier.html
  7. 25 1
      ruoyi-system/src/main/java/com/ruoyi/scm/service/impl/ProductInfoServiceImpl.java

+ 10 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/ProductInfoController.java
مشاهده فایل 

@@ -1,6 +1,8 @@
 
 package com.ruoyi.web.controller.scm;
 
 
 import java.util.List;
 
+
 
+import com.ruoyi.scm.domain.SupplierInfo;
 
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -40,7 +42,14 @@ public class ProductInfoController extends BaseController
 
     }
 
 
 
-
 
+    @RequiresPermissions("scm:production:approve")
 
+    @GetMapping("/approve/{id}")
 
+    public String approve(@PathVariable("id") String id, ModelMap mmap)
 
+    {
 
+        ProductInfo productInfo = productInfoService.selectProductInfoById(id);
 
+        mmap.put("productInfo", productInfo);
 
+        return prefix + "/approve";
 
+    }
 
 
 
     /**

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/ZSproducController.java
مشاهده فایل 

@@ -110,6 +110,7 @@ public class ZSproducController {
 
         productInfo.setWidth(StringUtils.isEmpty(product.getWidth()+"") ? "" : String.valueOf(product.getWidth()));
 
         productInfo.setHeight(StringUtils.isEmpty(product.getHeight()+"") ? "" : String.valueOf(product.getHeight()));
 
         productInfo.setModelCode(StringUtils.isEmpty(product.getModelCode()+"") ? "" : String.valueOf(product.getModelCode()));
 
+        productInfo.setType("10");
 
         return productInfo;
 
     }

+ 3 - 0
ruoyi-admin/src/main/resources/application-dev.yml
مشاهده فایل 

@@ -224,3 +224,6 @@ invoiceUrl: /guaranteeJSONCtrl/JSONFPInfoInterface.do
 
 
 #中盛url：
 
 zsIp: http://jinmamall.com.cn:80/esupplySysNewz/ynService/supplier!apply.do
 
+
 
+#中盛的下架通知
 
+zsDown: http://jinmamall.com.cn:80/esupplySysNewz/ynService/product!applyChangeStatus.do

+ 54 - 0
ruoyi-admin/src/main/resources/templates/scm/production/approve.html
مشاهده فایل 

@@ -0,0 +1,54 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 
+<head>
 
+    <th:block th:include="include :: header('新增保函订单')"/>
 
+    <th:block th:include="include :: datetimepicker-css"/>
 
+</head>
 
+<body class="white-bg">
 
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
+    <form class="form-horizontal m" id="form-process-add">
 
+        <input name="pId" th:field="*{productInfo.id}" type="hidden">
 
+        <div class="form-group">
 
+            <label class="col-sm-3 control-label">商品名称：</label>
 
+            <div class="col-sm-8">
 
+                <input name="premiumAmt" th:field="*{productInfo.skuName}" readonly="true"
 
+                       class="form-control" type="text">
 
+            </div>
 
+        </div>
 
+
 
+        <div class="form-group">
 
+            <label class="col-sm-3 control-label is-required">下架：</label>
 
+            <div class="col-sm-8">
 
+                <div class="radio">
 
+                    <label class="radio-box">
 
+                        <input type="radio" checked="" value="04" name="processStsCd">通过</label>
 
+                    <label class="radio-box">
 
+                        <input type="radio" value="03" name="processStsCd">未通过</label>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div>
 
+            <label class="col-sm-3 control-label">未通过原因：</label>
 
+            <div class="col-sm-8">
 
+                <textarea name="rejectReason" class="form-control"></textarea>
 
+            </div>
 
+        </div>
 
+    </form>
 
+</div>
 
+<th:block th:include="include :: footer"/>
 
+<th:block th:include="include :: datetimepicker-js"/>
 
+<script th:inline="javascript">
 
+    var prefix = ctx + "opt/process"
 
+    $("#form-process-add").validate({
 
+        focusCleanup: true
 
+    });
 
+
 
+    function submitHandler() {
 
+        if ($.validate.form()) {
 
+            $.operate.save(prefix + "/edit", $('#form-process-add').serialize());
 
+        }
 
+    }
 
+
 
+</script>
 
+</body>
 
+</html>

+ 34 - 16
ruoyi-admin/src/main/resources/templates/scm/production/production.html
مشاهده فایل 

@@ -128,20 +128,20 @@
 
                 </form>
 
             </div>
 
 
-            <div class="btn-group-sm" id="toolbar" role="group">
 
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="scm:production:add">
 
-                    <i class="fa fa-plus"></i> 添加
 
-                </a>
 
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="scm:production:edit">
 
-                    <i class="fa fa-edit"></i> 修改
 
-                </a>
 
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="scm:production:remove">
 
-                    <i class="fa fa-remove"></i> 删除
 
-                </a>
 
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="scm:production:export">
 
-                    <i class="fa fa-download"></i> 导出
 
-                </a>
 
-            </div>
 
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
 
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="scm:production:add">-->
 
+<!--                    <i class="fa fa-plus"></i> 添加-->
 
+<!--                </a>-->
 
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="scm:production:edit">-->
 
+<!--                    <i class="fa fa-edit"></i> 修改-->
 
+<!--                </a>-->
 
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="scm:production:remove">-->
 
+<!--                    <i class="fa fa-remove"></i> 删除-->
 
+<!--                </a>-->
 
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="scm:production:export">-->
 
+<!--                    <i class="fa fa-download"></i> 导出-->
 
+<!--                </a>-->
 
+<!--            </div>-->
 
             <div class="col-sm-12 select-table table-striped">
 
                 <table id="bootstrap-table"></table>
 
             </div>
 
@@ -285,14 +285,32 @@
 
                     align: 'center',
 
                     formatter: function(value, row, index) {
 
                         var actions = [];
 
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
 
+                        if ('10' == row.type) { // 待审核
 
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="down(\'' + row.id + '\')"><i class="fa fa-edit"></i>下架</a> ');
 
+                        }
 
+                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
+                        // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
 
                         return actions.join('');
 
                     }
 
                 }]
 
             };
 
             $.table.init(options);
 
         });
 
+
 
+
 
+        // 上架页面
 
+        // function up(id) {
 
+        //     $.modal.open("审核", "/scm/supplier/approve/" + id, '800', '350');
 
+        // }
 
+        //商品下架
 
+        function down(id) {
 
+            $.modal.confirm("确定下架本产品？", function () {
 
+                $.operate.save(prefix + "/edit", {"id": id, "type": "20"});
 
+            })
 
+        }
 
+        // function down(id) {
 
+        //     $.modal.open("审核", "scm/production/approve/" + id, '800', '350');
 
+        // }
 
     </script>
 
 </body>
 
 </html>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/scm/supplier/supplier.html
مشاهده فایل 

@@ -305,7 +305,7 @@
 
     <script th:inline="javascript">
 
         var editFlag = [[${@permission.hasPermi('scm:supplier:edit')}]];
 
         var removeFlag = [[${@permission.hasPermi('scm:supplier:remove')}]];
 
-        var scmFlag = [[${@permission.hasPermi('scm:supplier:scm')}]];
 
+        var scmFlag = [[${@permission.hasPermi('scm:supplier:edit')}]];
 
         var supplierNatureDatas = [[${@dict.getType('supplier_nature')}]];
 
         var supplierScaleDatas = [[${@dict.getType('supplier_scale')}]];
 
         var isMarketDatas = [[${@dict.getType('is_or_no')}]];

+ 25 - 1
ruoyi-system/src/main/java/com/ruoyi/scm/service/impl/ProductInfoServiceImpl.java
مشاهده فایل 

@@ -1,7 +1,12 @@
 
 package com.ruoyi.scm.service.impl;
 
 
-import java.util.List;
 
+import java.util.*;
 
+
 
+import com.alibaba.fastjson.JSON;
 
+import com.ruoyi.common.utils.http.HttpUtils;
 
+import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.stereotype.Service;
 
 import com.ruoyi.scm.mapper.ProductInfoMapper;
 
 import com.ruoyi.scm.domain.ProductInfo;
 
@@ -15,10 +20,13 @@ import com.ruoyi.common.core.text.Convert;
 
  * @date 2022-10-13
 
  */
 
 @Service
 
+@Slf4j
 
 public class ProductInfoServiceImpl implements IProductInfoService 
 {
 
     @Autowired
 
     private ProductInfoMapper productInfoMapper;
 
+    @Value("${zsDown}")
 
+    private String zsDown;
 
 
     /**
 
      * 查询商品
 
@@ -65,6 +73,22 @@ public class ProductInfoServiceImpl implements IProductInfoService
 
     @Override
 
     public int updateProductInfo(ProductInfo productInfo)
 
     {
 
+        //查询商品信息
 
+        ProductInfo productInfo1 = productInfoMapper.selectProductInfoById(productInfo.getId());
 
+        if ("20".equals(productInfo.getType())){
 
+            //下架的情况
 
+            Map<String, Object> map = new HashMap<>();
 
+            map.put("token", "123456");
 
+            map.put("supplierCode", productInfo1.getSupplierId());
 
+            Set<String> strings = new HashSet<>();
 
+            strings.add(productInfo1.getThirdSpuId());
 
+            map.put("thirdSkuIds",strings);
 
+            map.put("type", 20);
 
+            map.put("typeMsg", "测试");
 
+            String string = JSON.toJSONString(map);
 
+            String s = HttpUtils.sendPost(zsDown, string);
 
+            log.info(s);
 
+        }
 
         return productInfoMapper.updateProductInfo(productInfo);
 
     }