From 23e4325683bbaae1e7b126b5607d5fa910e35ca8 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 9 Jul 2024 08:53:25 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E5=88=97=E8=A1=A8=E6=8C=89=E7=85=A7=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F=E6=8E=92?=
 =?UTF-8?q?=E5=88=97=20=E6=96=B0=E5=A2=9E=20=E7=94=9F=E4=BA=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=93=81=E8=B4=A8=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E8=AF=A6=E6=83=85=E6=9D=83=E9=99=90=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QualityOrderController.java    |   2 +-
 .../WarehouseStorageOrderServiceImpl.java     |   3 +-
 .../mapper/quality/QualityOrderMapper.xml     |   1 +
 .../makeStartingQualityDetail.html            | 207 ++++++++++++++++++
 4 files changed, 210 insertions(+), 3 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQualityDetail.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java
index ddc0b264..49c71e12 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java
@@ -337,7 +337,7 @@ public class QualityOrderController extends BaseController
     {
         QualityOrder qualityOrder = qualityOrderService.selectQualityOrderById(qualityOrderId);
         mmap.put("qualityOrder", qualityOrder);
-        return prefix + "/makeInStartingQualityDetail";
+        return prefix + "/makeStartingQualityDetail";
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
index a26478ae..9c87e3b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
@@ -591,6 +591,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
         //暂收设置为全部品质
         warehouseStorageOrder.setWarehouseQualityStatus("2");
         warehouseStorageOrder.setWarehouseStorageStatus("2");
+        //设置为生产订单
         warehouseStorageOrder.setWarehouseStorageType("5");
         warehouseStorageOrder.setWarehouseOrderType("1");
         warehouseStorageOrder.setDeliveryInspectionTime(tempQualityOrder.getDeliveryInspectionTime());
@@ -599,8 +600,6 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
         warehouseStorageOrder.setCreateBy(loginName);
         warehouseStorageOrder.setQualityTime(new Date());
         warehouseStorageOrder.setCreateTime(new Date());
-        //设置委内完成数总价
-        warehouseStorageOrder.setMakeInTotalPrice(tempQualityOrder.getMakeInTotalPrice());
         //插入入库单详情数据
         for (QualityOrderDetail qualityOrderDetail : qualityOrderDetailList) {
 
diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
index 33ec0f68..43f588ce 100644
--- a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityEmployee != null  and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectQualityOrderById" parameterType="Long" resultMap="QualityOrderResult">
diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQualityDetail.html b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQualityDetail.html
new file mode 100644
index 00000000..af376dfb
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQualityDetail.html
@@ -0,0 +1,207 @@
+<!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-makeInStartingQualityDetail-edit" th:object="${qualityOrder}">
+        <input name="qualityOrderId" th:field="*{qualityOrderId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品质单号：</label>
+            <div class="col-sm-8">
+                <input name="qualityOrderCode" th:field="*{qualityOrderCode}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库单号：</label>
+            <div class="col-sm-8">
+                <input name="inStorageCode" th:field="*{inStorageCode}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">关联订单号：</label>
+            <div class="col-sm-8">
+                <input name="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品质单订单类型：</label>
+            <div class="col-sm-8">
+                <select name="qualityOrderType" class="form-control m-b" th:with="type=${@dict.getType('quality_order_type')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityOrderType}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品质单入库类型：</label>
+            <div class="col-sm-8">
+                <select name="qualityStorageStatus" class="form-control m-b" th:with="type=${@dict.getType('quality_storage_status')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityStorageStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">交付质检时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="deliveryInspectionTime" th:value="${#dates.format(qualityOrder.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+    </form>
+    <!--物料信息-->
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<!--用于可以修改列表字段的插件-->
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<script th:inline="javascript">
+
+
+    var qualityOrderCode = [[${qualityOrder.qualityOrderCode}]]
+    var qualityOrder = [[${qualityOrder}]]
+    var prefix = ctx + "quality/qualityOrder";
+    $("#form-makeInStartingQualityDetail-edit").validate({
+        focusCleanup: true
+    });
+
+    $("input[name='deliveryInspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+
+
+    // 新增提交
+    function submitHandler() {
+        // 获取表单数据
+        const qualityOrderData = $("#form-makeInStartingQualityDetail-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+        var table = $('#bootstrap-table').bootstrapTable('getData');
+
+        // 将表数据转换成与complaintNoticeData格式一致的数组
+        var materialDataList = table.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "qualityOrderDetailId": item.qualityOrderDetailId,
+                "materialNo": item.materialNo,
+                "thisArrivedNum": item.thisArrivedNum,
+                "qualityQualifiedNum": item.qualityQualifiedNum,
+                "qualityUnqualifiedNum": item.qualityUnqualifiedNum
+                // ...其他字段
+            };
+        });
+
+        const combinedData = Object.assign({}, qualityOrderData, {
+            qualityOrderDetailList: materialDataList,
+        });
+        // 合并表单数据和表格数据
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/makeInStartingQualityDetail", jsonData);
+    }
+
+    //物料信息展示列表
+    $(function() {
+        var options = {
+            modalName: "选择物料",
+            url: prefix + "/getMaterialListByQualityOrderCode",
+            queryParams: queryParams,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            pagination: false, // 设置不分页
+            columns: [{
+                checkbox: true
+            },
+                {
+                    title: '品质单详情ID',
+                    field: 'qualityOrderDetailId',
+                    visible: false
+                },
+                {
+                    title: '料号',
+                    field: 'materialNo'
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName'
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                },
+                {
+                    title: '物料图片地址',
+                    field: 'materialPhotourl',
+                },
+                {
+                    title: '物料描述',
+                    field: 'materialDescribe',
+                },
+                {
+                    title: '物料品牌',
+                    field: 'materialBrand',
+                },
+                {
+                    title: '物料单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '物料加工方式',
+                    field: 'materialProcessMethod',
+                },
+                {
+                    title: '生产订单数',
+                    field: 'makeTotal',
+                },
+                {
+                    title: '品质已合格数',
+                    field: 'qualityHasqualifiedNum',
+                },
+                {
+                    title: '本次到货数',
+                    field: 'thisArrivedNum',
+                },
+                {
+                    title: '品质合格数',
+                    field: 'qualityQualifiedNum',
+                },
+                {
+                    title: '品质不合格数',
+                    field: 'qualityUnqualifiedNum',
+                }]
+        };
+        $.table.init(options);
+    })
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            qualityOrderCode:  qualityOrderCode
+        };
+        console.log(curParams);
+        return curParams;
+    }
+
+
+</script>
+</body>
+</html>
\ No newline at end of file