查询订单列表修改

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderBaseController.java

@@ -1,11 +1,9 @@
 package com.dgtly.order.controller;
 
-import java.util.List;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.dgtly.common.exception.base.BaseException;
 import com.dgtly.common.utils.MapDataUtil;
-import com.dgtly.order.domain.OrderBase;
+import com.dgtly.order.domain.OrderDetailModel;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,7 +55,9 @@ public class OrderBaseController extends BaseController {
     @ResponseBody
     public Object list(HttpServletRequest request) {
         String str = "";
-        String url = cloudPath + "order"+"/order/orderbase/list";
+
+        String url = cloudPath + "order"+"/order/meta-hana-sales-order/list";
+
         try{
             //设置为form方式
             HttpHeaders headers = new HttpHeaders();
@@ -78,13 +78,19 @@ public class OrderBaseController extends BaseController {
      * 修改订单基础 订单的基础信息
      */
     @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Long id, ModelMap mmap) {
-        String url = cloudPath + "order"+"/order/orderbase/info/" + id;
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        String url = cloudPath + "order"+"/order/meta-hana-sales-order/orderLineDetail?orderNumber=" + id;
+        //String url = "http://10.32.2.212:8000/" + "order"+"/order/meta-hana-sales-order/orderLineDetail?orderNumber=" + id;
         String str= "";
         try{
             str = restTemplate.getForObject(url, String.class);
-            OrderBase orderBase = JSONObject.toJavaObject(JSON.parseObject(str), OrderBase.class);
-            mmap.put("orderBase", orderBase);
+            JSONObject json = JSONObject.parseObject(str);
+            if(json.getInteger("code")==200){
+
+                mmap.put("orderBase", json.getObject("data",OrderDetailModel.class));
+            }else{
+                throw new BaseException("order",json.getString("message"));
+            }
         }catch(Exception e){
             logger.error("查询基础订单详情报错"+url,e);
             throw e;

suishenbang-order/src/main/java/com/dgtly/order/domain/OrderBase.java

@@ -1,266 +0,0 @@
-package com.dgtly.order.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.dgtly.common.annotation.Excel;
-import com.dgtly.common.core.domain.BaseEntity;
-import java.util.Date;
-
-/**
- * 订单基础 订单的基础信息对象 order_base
- * 
- * @author qxp
- * @date 2020-07-10
- */
-public class OrderBase extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    private Long id;
-
-    /** 是否删除 */
-    private String isDelete;
-
-    /** 订单所属 订单的所属公司 */
-    @Excel(name = "订单所属 订单的所属公司")
-    private String orderBelong;
-
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String orderNumber;
-
-    /** 订单生成时间 */
-    @Excel(name = "订单生成时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date orderCreationTime;
-
-    /** 订单金额 */
-    @Excel(name = "订单金额")
-    private Double orderAmount;
-
-    /** 冻结金额 */
-    @Excel(name = "冻结金额")
-    private Double freezeAmount;
-
-    /** 未清金额 */
-    @Excel(name = "未清金额")
-    private Double unclearAmount;
-
-    /** 发货未过账 */
-    @Excel(name = "发货未过账")
-    private Double shipmentNotPosted;
-
-    /** 发货已过账 */
-    @Excel(name = "发货已过账")
-    private Double shipmentPosted;
-
-    /** 订单状态 */
-    @Excel(name = "订单状态")
-    private Long orderStatus;
-
-    /** 到货地址 */
-    @Excel(name = "到货地址")
-    private String shippingAddress;
-
-    /** 过信用时间 */
-    @Excel(name = "过信用时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date passCreditTime;
-
-    /** 期望到货开始时间 */
-    @Excel(name = "期望到货开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date expectedStartTime;
-
-    /** 期望到货结束时间 */
-    @Excel(name = "期望到货结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date expectedEndTime;
-
-    /** 订单结束时间 */
-    @Excel(name = "订单结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date orderEndTime;
-
-    /** 订单所属 */
-    @Excel(name = "订单所属")
-    private String belongTo;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsDelete(String isDelete) 
-    {
-        this.isDelete = isDelete;
-    }
-
-    public String getIsDelete() 
-    {
-        return isDelete;
-    }
-    public void setOrderBelong(String orderBelong) 
-    {
-        this.orderBelong = orderBelong;
-    }
-
-    public String getOrderBelong() 
-    {
-        return orderBelong;
-    }
-    public void setOrderNumber(String orderNumber) 
-    {
-        this.orderNumber = orderNumber;
-    }
-
-    public String getOrderNumber() 
-    {
-        return orderNumber;
-    }
-    public void setOrderCreationTime(Date orderCreationTime) 
-    {
-        this.orderCreationTime = orderCreationTime;
-    }
-
-    public Date getOrderCreationTime() 
-    {
-        return orderCreationTime;
-    }
-    public void setOrderAmount(Double orderAmount) 
-    {
-        this.orderAmount = orderAmount;
-    }
-
-    public Double getOrderAmount() 
-    {
-        return orderAmount;
-    }
-    public void setFreezeAmount(Double freezeAmount) 
-    {
-        this.freezeAmount = freezeAmount;
-    }
-
-    public Double getFreezeAmount() 
-    {
-        return freezeAmount;
-    }
-    public void setUnclearAmount(Double unclearAmount) 
-    {
-        this.unclearAmount = unclearAmount;
-    }
-
-    public Double getUnclearAmount() 
-    {
-        return unclearAmount;
-    }
-    public void setShipmentNotPosted(Double shipmentNotPosted) 
-    {
-        this.shipmentNotPosted = shipmentNotPosted;
-    }
-
-    public Double getShipmentNotPosted() 
-    {
-        return shipmentNotPosted;
-    }
-    public void setShipmentPosted(Double shipmentPosted) 
-    {
-        this.shipmentPosted = shipmentPosted;
-    }
-
-    public Double getShipmentPosted() 
-    {
-        return shipmentPosted;
-    }
-    public void setOrderStatus(Long orderStatus) 
-    {
-        this.orderStatus = orderStatus;
-    }
-
-    public Long getOrderStatus() 
-    {
-        return orderStatus;
-    }
-    public void setShippingAddress(String shippingAddress) 
-    {
-        this.shippingAddress = shippingAddress;
-    }
-
-    public String getShippingAddress() 
-    {
-        return shippingAddress;
-    }
-    public void setPassCreditTime(Date passCreditTime) 
-    {
-        this.passCreditTime = passCreditTime;
-    }
-
-    public Date getPassCreditTime() 
-    {
-        return passCreditTime;
-    }
-    public void setExpectedStartTime(Date expectedStartTime) 
-    {
-        this.expectedStartTime = expectedStartTime;
-    }
-
-    public Date getExpectedStartTime() 
-    {
-        return expectedStartTime;
-    }
-    public void setExpectedEndTime(Date expectedEndTime) 
-    {
-        this.expectedEndTime = expectedEndTime;
-    }
-
-    public Date getExpectedEndTime() 
-    {
-        return expectedEndTime;
-    }
-    public void setOrderEndTime(Date orderEndTime) 
-    {
-        this.orderEndTime = orderEndTime;
-    }
-
-    public Date getOrderEndTime() 
-    {
-        return orderEndTime;
-    }
-    public void setBelongTo(String belongTo) 
-    {
-        this.belongTo = belongTo;
-    }
-
-    public String getBelongTo() 
-    {
-        return belongTo;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDelete", getIsDelete())
-            .append("orderBelong", getOrderBelong())
-            .append("orderNumber", getOrderNumber())
-            .append("orderCreationTime", getOrderCreationTime())
-            .append("orderAmount", getOrderAmount())
-            .append("freezeAmount", getFreezeAmount())
-            .append("unclearAmount", getUnclearAmount())
-            .append("shipmentNotPosted", getShipmentNotPosted())
-            .append("shipmentPosted", getShipmentPosted())
-            .append("orderStatus", getOrderStatus())
-            .append("shippingAddress", getShippingAddress())
-            .append("passCreditTime", getPassCreditTime())
-            .append("expectedStartTime", getExpectedStartTime())
-            .append("expectedEndTime", getExpectedEndTime())
-            .append("orderEndTime", getOrderEndTime())
-            .append("belongTo", getBelongTo())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

suishenbang-order/src/main/java/com/dgtly/order/domain/OrderDetailModel.java

@@ -0,0 +1,148 @@
+package com.dgtly.order.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单基础 订单的基础信息对象 order_base
+ * 
+ * @author qxp
+ * @date 2020-07-10
+ */
+public class OrderDetailModel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    //订单号
+    private String orderNumber;
+    //创建时间
+    private String orderCreationTime;
+    //总重量
+    private BigDecimal orderWeight = new BigDecimal("0.00000");
+    //订单金额
+    private BigDecimal orderAmount = new BigDecimal("0.00000");
+    //发货过账
+    private BigDecimal shipmentPosted = new BigDecimal("0.00000");
+    //发货未过账
+    private BigDecimal shipmentNotPosted = new BigDecimal("0.00000");
+    //未清金额
+    private BigDecimal unclearAmount = new BigDecimal("0.00000");
+    //冻结金额
+    private BigDecimal freezeAmount = new BigDecimal("0.00000");
+    /**
+     * 订单状态 (ui上需要只需要11 12 14 15 16)
+     * 10 订单初建
+     * 11 待过信用
+     * 12 待确认收货时间
+     * 13 已确认收货时间
+     * 14 待发货
+     * 15 待收货
+     * 16 待评价
+     */
+    private int status = 10;
+    //    行明细
+    private List<OrderLineDetailLineModel> orderLineDetailLineModels = new ArrayList<>();
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderCreationTime() {
+        return orderCreationTime;
+    }
+
+    public void setOrderCreationTime(String orderCreationTime) {
+        this.orderCreationTime = orderCreationTime;
+    }
+
+    public BigDecimal getOrderWeight() {
+        return orderWeight;
+    }
+
+    public void setOrderWeight(BigDecimal orderWeight) {
+        this.orderWeight = orderWeight;
+    }
+
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public BigDecimal getShipmentPosted() {
+        return shipmentPosted;
+    }
+
+    public void setShipmentPosted(BigDecimal shipmentPosted) {
+        this.shipmentPosted = shipmentPosted;
+    }
+
+    public BigDecimal getShipmentNotPosted() {
+        return shipmentNotPosted;
+    }
+
+    public void setShipmentNotPosted(BigDecimal shipmentNotPosted) {
+        this.shipmentNotPosted = shipmentNotPosted;
+    }
+
+    public BigDecimal getUnclearAmount() {
+        return unclearAmount;
+    }
+
+    public void setUnclearAmount(BigDecimal unclearAmount) {
+        this.unclearAmount = unclearAmount;
+    }
+
+    public BigDecimal getFreezeAmount() {
+        return freezeAmount;
+    }
+
+    public void setFreezeAmount(BigDecimal freezeAmount) {
+        this.freezeAmount = freezeAmount;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public List<OrderLineDetailLineModel> getOrderLineDetailLineModels() {
+        return orderLineDetailLineModels;
+    }
+
+    public void setOrderLineDetailLineModels(List<OrderLineDetailLineModel> orderLineDetailLineModels) {
+        this.orderLineDetailLineModels = orderLineDetailLineModels;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderDetailModel{" +
+                "orderNumber='" + orderNumber + '\'' +
+                ", orderCreationTime='" + orderCreationTime + '\'' +
+                ", orderWeight=" + orderWeight +
+                ", orderAmount=" + orderAmount +
+                ", shipmentPosted=" + shipmentPosted +
+                ", shipmentNotPosted=" + shipmentNotPosted +
+                ", unclearAmount=" + unclearAmount +
+                ", freezeAmount=" + freezeAmount +
+                ", status=" + status +
+                ", orderLineDetailLineModels=" + orderLineDetailLineModels +
+                '}';
+    }
+}

suishenbang-order/src/main/java/com/dgtly/order/domain/OrderLineDetailLineModel.java

@@ -0,0 +1,84 @@
+package com.dgtly.order.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author: csz
+ * @Date: 2020/8/7 15:35
+ */
+public class OrderLineDetailLineModel implements Serializable {
+    //    行项目号
+    private String orderItem;
+    //  物料名称
+    private String materialName;
+    //    规格
+    private String sizeDim;
+    //    数量
+    private BigDecimal count = new BigDecimal(0);
+    //  未交货数量
+    private BigDecimal notDeliveryCount = new BigDecimal(0);
+    //    发货数量
+    private BigDecimal sendCount = new BigDecimal(0);
+    //    已收货数量
+    private BigDecimal collectCount = new BigDecimal(0);
+
+
+    public String getOrderItem() {
+        return orderItem;
+    }
+
+    public void setOrderItem(String orderItem) {
+        this.orderItem = orderItem;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getSizeDim() {
+        return sizeDim;
+    }
+
+    public void setSizeDim(String sizeDim) {
+        this.sizeDim = sizeDim;
+    }
+
+    public BigDecimal getCount() {
+        return count;
+    }
+
+    public void setCount(BigDecimal count) {
+        this.count = count;
+    }
+
+    public BigDecimal getNotDeliveryCount() {
+        return notDeliveryCount;
+    }
+
+    public void setNotDeliveryCount(BigDecimal notDeliveryCount) {
+        this.notDeliveryCount = notDeliveryCount;
+    }
+
+    public BigDecimal getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(BigDecimal sendCount) {
+        this.sendCount = sendCount;
+    }
+
+    public BigDecimal getCollectCount() {
+        return collectCount;
+    }
+
+    public void setCollectCount(BigDecimal collectCount) {
+        this.collectCount = collectCount;
+    }
+}

suishenbang-order/src/main/resources/templates/order/orderbase/edit.html

@@ -7,114 +7,95 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-orderbase-edit" th:object="${orderBase}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">订单所属 订单的所属公司：</label>
-                <div class="col-sm-8">
-                    <input name="orderBelong" th:field="*{orderBelong}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">订单号：</label>
+
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">订单编号：</label>
                 <div class="col-sm-8">
                     <input name="orderNumber" th:field="*{orderNumber}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">订单生成时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="orderCreationTime" th:value="${#dates.format(orderBase.orderCreationTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                        <input name="orderCreationTime" th:field="*{orderCreationTime}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">订单金额：</label>
                 <div class="col-sm-8">
                     <input name="orderAmount" th:field="*{orderAmount}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">冻结金额：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">订单重量：</label>
                 <div class="col-sm-8">
-                    <input name="freezeAmount" th:field="*{freezeAmount}" class="form-control" type="text">
+                    <input name="orderAmount" th:field="*{orderWeight}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">未清金额：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">发货过账：</label>
                 <div class="col-sm-8">
-                    <input name="unclearAmount" th:field="*{unclearAmount}" class="form-control" type="text">
+                    <input name="freezeAmount" th:field="*{shipmentPosted}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">发货未过账：</label>
                 <div class="col-sm-8">
-                    <input name="shipmentNotPosted" th:field="*{shipmentNotPosted}" class="form-control" type="text">
+                    <input name="unclearAmount" th:field="*{shipmentNotPosted}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">发货已过账：</label>
-                <div class="col-sm-8">
-                    <input name="shipmentPosted" th:field="*{shipmentPosted}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">订单状态：</label>
-                <div class="col-sm-8">
-                    <select name="orderStatus" class="form-control m-b" th:with="type=${@dict.getType('order_type')}" readonly="true">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{orderStatus}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">到货地址：</label>
-                <div class="col-sm-8">
-                    <input name="shippingAddress" th:field="*{shippingAddress}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">过信用时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="passCreditTime" th:value="${#dates.format(orderBase.passCreditTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">期望到货开始时间：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">未清金额：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="expectedStartTime" th:value="${#dates.format(orderBase.expectedStartTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                    </div>
+                    <input name="shipmentNotPosted" th:field="*{unclearAmount}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">期望到货结束时间：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">冻结金额：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="expectedEndTime" th:value="${#dates.format(orderBase.expectedEndTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                    </div>
+                    <input name="shipmentPosted" th:field="*{freezeAmount}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">订单结束时间：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">订单状态：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="orderEndTime" th:value="${#dates.format(orderBase.orderEndTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                    </div>
+                    <select name="status" class="form-control m-b" th:with="type=${@dict.getType('order_type')}" readonly="true" disabled>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{status}"></option>
+                    </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">订单所属：</label>
-                <div class="col-sm-8">
-                    <input name="belongTo" th:field="*{belongTo}" class="form-control" type="text">
-                </div>
+            <div class="form-group">
+                <div class="table-responsive">
+                    <table class="table table-bordered table-striped">
+                        <thead>
+                            <tr>
+                                <th>物料名称</th>
+                                <th>规格</th>
+                                <th>数量</th>
+                                <th>未交货数量</th>
+                                <th>发货数量</th>
+                                <th>已收货数量</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <tr  th:each="info,infoStat : ${orderBase.orderLineDetailLineModels}" >
+                            <th th:text="${info.materialName}"></th>
+                            <th th:text="${info.sizeDim}"></th>
+                            <th th:text="${info.count}"></th>
+                            <th th:text="${info.notDeliveryCount}"></th>
+                            <th th:text="${info.sendCount}"></th>
+                            <th th:text="${info.collectCount}"></th>
+                        </tr>
+                        </tbody>
+
+                </table>
+
             </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -130,35 +111,7 @@
         }
 
 
-        $("input[name='orderCreationTime']").datetimepicker({
-            format: "yyyy-MM-dd HH:mm:ss",
-            minView: "day",
-            autoclose: true
-        });
-
-        $("input[name='passCreditTime']").datetimepicker({
-            format: "yyyy-MM-dd HH:mm:ss",
-            minView: "day",
-            autoclose: true
-        });
-
-        $("input[name='expectedStartTime']").datetimepicker({
-            format: "yyyy-MM-dd HH:mm:ss",
-            minView: "day",
-            autoclose: true
-        });
-
-        $("input[name='expectedEndTime']").datetimepicker({
-            format: "yyyy-MM-dd HH:mm:ss",
-            minView: "day",
-            autoclose: true
-        });
 
-        $("input[name='orderEndTime']").datetimepicker({
-            format: "yyyy-MM-dd HH:mm:ss",
-            minView: "day",
-            autoclose: true
-        });
     </script>
 </body>
 </html>

suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html

@@ -10,129 +10,61 @@
             <div class="col-sm-12 search-collapse">
                 <form id="formId" class="form-horizontal m">
                     <div class="row">
-                        <div class="form-group col-sm-3">
-                            <label class="control-label col-sm-4">订单所属：</label>
+
+                        <div class="form-group col-sm-3 row">
+                            <label class="control-label col-sm-4">订单号：</label>
                             <div class="input-group col-sm-8">
-                                <input class="form-control" type="text" name="orderBelong"/>
+                                <input class="form-control" type="text" name="docNumber"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-3 row">
-                            <label class="control-label col-sm-4">订单号：</label>
+                        <div class="form-group col-sm-3">
+                            <label class="control-label col-sm-4">经销商名字：</label>
                             <div class="input-group col-sm-8">
-                                <input class="form-control" type="text" name="orderNumber"/>
+                                <input class="form-control" type="text" name="customerName"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-5">
-                            <label class="control-label col-sm-3">订单生成时间：</label>
-                            <div class="input-daterange input-group col-sm-9">
-                                <input type="text" class="input-sm form-control" id="dp-s-orderCreate" name="params[beginOrderCreationTime]" placeholder="yyyy-MM-dd"/>
-                                <span class="input-group-addon">到</span>
-                                <input type="text" class="input-sm form-control" id="dp-e-orderCreate" name="params[endOrderCreationTime]" placeholder="yyyy-MM-dd"/>
+                        <div class="form-group col-sm-3 row">
+                            <label class="control-label col-sm-4">经销商编号：</label>
+                            <div class="input-group col-sm-8">
+                                <input class="form-control" type="text" name="customerCode"/>
                             </div>
                         </div>
+
                     </div>
                     <div class="row">
-                        <div class="form-group col-sm-3">
-                            <label class="control-label col-sm-4">订单状态：</label>
+                        <div class="form-group col-sm-3 row">
+                            <label class="control-label col-sm-4">销售组织名字：</label>
                             <div class="input-group col-sm-8">
-                                <select class="form-control " name="orderStatus" th:with="type=${@dict.getType('order_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
+                                <input class="form-control" type="text" name="salesOrgName"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-5">
-                            <label class="control-label col-sm-3">过信用时间：</label>
-                            <div class="input-daterange input-group col-sm-9">
-                                <input type="text" class="input-sm form-control" id="dp-s-passCredit" name="params[beginPassCreditTime]" placeholder="yyyy-MM-dd"/>
-                                <span class="input-group-addon">到</span>
-                                <input type="text" class="input-sm form-control " id="dp-e-passCredit" name="params[beginPassCreditTime]" placeholder="yyyy-MM-dd"/>
+                        <div class="form-group col-sm-3">
+                            <label class="control-label col-sm-4">销售组织编码：</label>
+                            <div class="input-group col-sm-8">
+                                <input class="form-control" type="text" name="salesOrg"/>
                             </div>
                         </div>
-
-                        <div class="form-group col-sm-3">
-                            <label class="control-label col-sm-4">订单所属：</label>
+                        <div class="form-group col-sm-3 row">
+                            <label class="control-label col-sm-4">信用状态：</label>
                             <div class="input-group col-sm-8">
-                                <input class="form-control" type="text" name="belongTo"/>
+                                <select class="form-control m-b" name="creditStatus">
+                                    <option value="">所有</option>
+                                    <option value="信用通过">信用通过</option>
+                                    <option value="信用未通过">信用未通过</option>
+                                </select>
                             </div>
                         </div>
+
                     </div>
                     <div class="row">
-                        <div class="form-group col-sm-5">
-                            <label class="control-label col-sm-3">订单结束时间：</label>
-                            <div class="input-daterange input-group col-sm-9">
-                                <input type="text" class="input-sm form-control" id="dp-s-orderEnd" name="pparams[beginOrderEndTime]" placeholder="yyyy-MM-dd"/>
-                                <span class="input-group-addon">到</span>
-                                <input type="text" class="input-sm form-control " id="dp-e-orderEnd" name="params[endOrderEndTime]" placeholder="yyyy-MM-dd"/>
-                            </div>
-                        </div>
+
                         <div class="col-sm-1"></div>
                         <div class="form-group col-sm-2">
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                         </div>
                     </div>
-                    <!--<div class="select-list">-->
-                        <!--<ul>-->
-                            <!--<li>-->
-                                <!--<p>订单所属 订单的所属公司：</p>-->
-                                <!--<input type="text" name="orderBelong"/>-->
-                            <!--</li>-->
-                            <!--<li>-->
-                                <!--<p>订单号：</p>-->
-                                <!--<input type="text" name="orderNumber"/>-->
-                            <!--</li>-->
-                            <!--<li class="select-time">-->
-                                <!--<p>订单生成时间：</p>-->
-                                <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderCreationTime]"/>-->
-                                <!--<span>-</span>-->
-                                <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderCreationTime]"/>-->
-                            <!--</li>-->
-                            <!--<li>-->
-                                <!--<p>订单状态：</p>-->
-                                <!--<select name="orderStatus" th:with="type=${@dict.getType('order_type')}">-->
-                                    <!--<option value="">所有</option>-->
-                                    <!--<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-                                <!--</select>-->
-                            <!--</li>-->
-                            <!--<li>-->
-                                <!--<p>到货地址：</p>-->
-                                <!--<input type="text" name="shippingAddress"/>-->
-                            <!--</li>-->
-                            <!--<li class="select-time">-->
-                                <!--<p>过信用时间：</p>-->
-                                <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginPassCreditTime]"/>-->
-                                <!--<span>-</span>-->
-                                <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endPassCreditTime]"/>-->
-                            <!--</li>-->
-                            <!--<li class="select-time">-->
-                                <!--<p>期望到货开始时间：</p>-->
-                                <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedStartTime]"/>-->
-                                <!--<span>-</span>-->
-                                <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedStartTime]"/>-->
-                            <!--</li>-->
-                            <!--<li class="select-time">-->
-                                <!--<p>期望到货结束时间：</p>-->
-                                <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedEndTime]"/>-->
-                                <!--<span>-</span>-->
-                                <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedEndTime]"/>-->
-                            <!--</li>-->
-                            <!--<li class="select-time">-->
-                                <!--<p>订单结束时间：</p>-->
-                                <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderEndTime]"/>-->
-                                <!--<span>-</span>-->
-                                <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderEndTime]"/>-->
-                            <!--</li>-->
-                            <!--<li>-->
-                                <!--<p>订单所属：</p>-->
-                                <!--<input type="text" name="belongTo"/>-->
-                            <!--</li>-->
-                            <!--<li>-->
-                                <!--<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>-->
-                                <!--<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>-->
-                            <!--</li>-->
-                        <!--</ul>-->
-                    <!--</div>-->
+
                 </form>
             </div>
 
@@ -170,85 +102,46 @@
                 updateUrl: prefix + "/edit/{id}",
                 modalName: "订单基础 订单的基础信息",
                 columns: [{
-                    checkbox: true
+                    checkbox: false
                 },
                 {
-                    field : 'id', 
-                    title : 'id',
-                    visible: false
+                    field : 'docNumber',
+                    title : '订单编号'
                 },
                 {
-                    field : 'orderBelong', 
-                    title : '订单所属 订单的所属公司'
+                    field : 'customerName',
+                    title : '经销商'
                 },
                 {
-                    field : 'orderNumber', 
-                    title : '订单号'
+                    field : 'salesOrgName',
+                    title : '销售组织名字'
                 },
                 {
-                    field : 'orderCreationTime', 
+                    field : 'createDate',
                     title : '订单生成时间'
                 },
                 {
-                    field : 'orderAmount', 
-                    title : '订单金额'
-                },
-                {
-                    field : 'freezeAmount', 
-                    title : '冻结金额'
-                },
-                {
-                    field : 'unclearAmount', 
-                    title : '未清金额'
-                },
-                {
-                    field : 'shipmentNotPosted', 
-                    title : '发货未过账'
+                    field : 'docType',
+                    title : '订单类型'
                 },
                 {
-                    field : 'shipmentPosted', 
-                    title : '发货已过账'
-                },
-                {
-                    field : 'orderStatus', 
-                    title : '订单状态',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(orderStatusDatas, value);
-                    }
+                    field : 'creditStatus',
+                    title : '信用状态'
                 },
-                // {
-                //     field : 'shippingAddress',
-                //     title : '到货地址'
-                // },
-                // {
-                //     field : 'passCreditTime',
-                //     title : '过信用时间'
-                // },
-                // {
-                //     field : 'expectedStartTime',
-                //     title : '期望到货开始时间'
-                // },
-                // {
-                //     field : 'expectedEndTime',
-                //     title : '期望到货结束时间'
-                // },
-                // {
-                //     field : 'orderEndTime',
-                //     title : '订单结束时间'
-                // },
                 {
-                    field : 'belongTo', 
-                    title : '订单所属'
+                    field : 'creditStatus',
+                    title : '信用状态'
                 },
                 {
                     title: '操作',
                     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-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.docNumber + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         return actions.join('');
                     }
-                }]
+                }
+                ]
             };
             $.table.init(options);
         });