[fix]销售管理:

销售订单
修改销售订单的列表查询，根据创建时间 进行排序
修改销售订单的物料合计数据类型 Double -> Long
新增销售订单转生产订单方法
修复生产订单确认时间异常问题
新增销售订单作废 前端url

ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java

@@ -453,6 +453,8 @@ public class SysSalesOrderController extends BaseController
             SysSalesOrderVo sysSalesOrderVo1 = sysSalesOrderService.selectSysSalesOrderById(sysSalesOrderVo.getSalesOrderId());
             //生产订单生成
             sysMakeOrderService.generateMakeOrderBySalesOrderCode(sysSalesOrderVo1.getSalesOrderCode());
+
+
             // 提交
             if("submit".equals(instanceType)){
                 // 使用状态-是

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java

@@ -57,7 +57,7 @@ public class SysSalesOrder extends BaseEntity {
     /*客户电话*/
     private String customerPhone;
     /*物料合计*/
-    private Double materialSum;
+    private Long materialSum;
     /*数量合计*/
     private Long enterpriseSum;
     /*不含税单价(RMB)*/
@@ -297,11 +297,11 @@ public class SysSalesOrder extends BaseEntity {
         this.customerPhone = customerPhone;
     }
 
-    public Double getMaterialSum() {
+    public Long getMaterialSum() {
         return materialSum;
     }
 
-    public void setMaterialSum(Double materialSum) {
+    public void setMaterialSum(Long materialSum) {
         this.materialSum = materialSum;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java

@@ -195,6 +195,15 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
         // 是
         makeOrder.setUseStatus("1");
         makeOrder.setSaleNo(salesOrderCode);
+        makeOrder.setMakeStatus("0");
+        makeOrder.setSalesman(sysSalesOrderVo.getBusinessMembers());
+        makeOrder.setSaleNo(sysSalesOrderVo.getSalesOrderCode());
+        makeOrder.setOrderType(sysSalesOrderVo.getSalesOrderType());
+        makeOrder.setCustomerId(sysSalesOrderVo.getEnterpriseCode());
+        makeOrder.setCustomerName(sysSalesOrderVo.getEnterpriseName());
+        makeOrder.setCustomerOderCode(sysSalesOrderVo.getSalesOrderNumber());
+        makeOrder.setMaterialSum(sysSalesOrderVo.getEnterpriseSum());
+        makeOrder.setMaterial(String.valueOf(sysSalesOrderVo.getMaterialSum()));
         String makeNo = redisCache.generateBillNo("PO");
         makeOrder.setMakeNo(makeNo);
         insertSysMakeOrder(makeOrder);

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTime != null  and applyTime != ''"> and s.apply_time = #{applyTime}</if>
             <if test="applyTitle != null  and applyTitle != ''"> and s.apply_title = #{applyTitle}</if>
         </where>
-        order by s.apply_time desc
+        order by s.create_time desc
     </select>
     
     <select id="selectSysSalesOrderById" parameterType="Long" resultMap="SysSalesOrderResult">

ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html

@@ -35,7 +35,6 @@
                     </select>
                 </div>
             </div>
-        </form>
             <div class="container">
                 <div class="row">
                     <div class="col-sm-12 select-table table-striped">
@@ -43,6 +42,8 @@
                     </div>
                 </div>
             </div>
+        </form>
+
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />

ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

@@ -228,6 +228,7 @@
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
+            cancelUrl: prefix + "/cancel/{id}",
             detailUrl: prefix + "/detail/{id}",
             pagination: true,
             pageList: [5, 10, 25, 50],
@@ -353,6 +354,11 @@
                             // 进度查看
                             actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                         }
+
+                        if (row.makeStatus == "0" ||  row.makeStatus == "1"){
+                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.salesOrderId + '\')"><i class="fa fa-edit"></i> 出货</a> ');
+                        }
+
                         // 详情
                         actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.salesOrderId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
                         return actions.join('');