Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java

@@ -780,13 +780,13 @@ public class AftersalesOutOrderServiceImpl implements IAftersalesOutOrderService
     }
 
     private void confirmCheckUpdateSalesOrderChild(List<SysSalesShippingInformDetail> shippingInformDetailList, SysSalesShippingInform sysSalesShippingInform) {
-        // 根据 shipping_inform_detail_id 分组，并合计每组的 getThisReceivingNum
+        // 根据 shipping_inform_detail_id 分组，并合计每组的 getThisCheckNum
         Map<Long, SysSalesShippingInformDetail> groupedDetails = shippingInformDetailList.stream()
                 .collect(Collectors.toMap(
                         SysSalesShippingInformDetail::getShippingInformDetailId,
                         Function.identity(),
                         (existing, replacement) -> {
-                            existing.setThisReceivingNum(existing.getThisReceivingNum() + replacement.getThisReceivingNum());
+                            existing.setThisReceivingNum(existing.getThisCheckNum() + replacement.getThisCheckNum());
                             return existing;
                         },
                         LinkedHashMap::new // 保持插入顺序

ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java

@@ -42,6 +42,11 @@ public class PurchaseQuoteChild extends BaseEntity
     @Excel(name = "物料的加工方式")
     private String processMethod;
 
+
+    /** 物料的型号 */
+    @Excel(name = "物料的型号")
+    private String materialModel;
+
     /** 物料的品牌 */
     @Excel(name = "物料的品牌")
     private String brand;
@@ -294,6 +299,15 @@ public class PurchaseQuoteChild extends BaseEntity
     public String getCorrelationCode() {
         return correlationCode;
     }
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -304,6 +318,7 @@ public class PurchaseQuoteChild extends BaseEntity
             .append("materialName", getMaterialName())
             .append("materialType", getMaterialType())
             .append("processMethod", getProcessMethod())
+            .append("materialModel", getMaterialModel())
             .append("brand", getBrand())
             .append("photoUrl", getPhotoUrl())
             .append("describe", getDescribe())

ruoyi-admin/src/main/resources/application.yml

@@ -3,7 +3,7 @@ ruoyi:
   # 名称
   name: wancaiErp
   # 版本
-  version: 1.0.0
+  version: 2.0.0
   # 版权年份
   copyrightYear: 2024
   # 实例演示开关

ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"             column="material_name"              />
         <result property="materialType"             column="material_type"              />
         <result property="processMethod"            column="processMethod"              />
+        <result property="materialModel"            column="material_model"              />
         <result property="brand"                    column="brand"                      />
         <result property="photoUrl"                 column="photoUrl"                   />
         <result property="describe"                 column="describe"                   />
@@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPurchaseQuoteChildVo">
         select purchase_quote_child_id, purchase_quote_code, material_id, material_code,
-            material_name, material_type, processMethod, brand, photoUrl, `describe`, tax_rate, usd_rate,
+            material_name, material_type, processMethod, material_model, brand, photoUrl, `describe`, tax_rate, usd_rate,
             material_num, material_sole, material_rmb, material_noRmb,supplier_code, supplier_name,
             create_by, create_time, update_by, update_time, remark, use_status, audit_status,
             del_flag from purchase_quote_child
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPurchaseQuoteChildList" parameterType="PurchaseQuoteChild" resultMap="PurchaseQuoteChildResult">
         select purchase_quote_child_id, purchase_quote_code, material_id, material_code,
-        material_name, material_type, processMethod, brand, photoUrl, `describe`, tax_rate, usd_rate,
+        material_name, material_type, processMethod, material_model, brand, photoUrl, `describe`, tax_rate, usd_rate,
         material_num, material_sole, material_rmb, material_noRmb,supplier_code, supplier_name,
         create_by, create_time, update_by, update_time, remark, use_status, audit_status,
         del_flag from purchase_quote_child
@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">material_name,</if>
             <if test="materialType != null">material_type,</if>
             <if test="processMethod != null">processMethod,</if>
+            <if test="materialModel != null">material_model,</if>
             <if test="brand != null">brand,</if>
             <if test="photoUrl != null">photoUrl,</if>
             <if test="describe != null">`describe`,</if>
@@ -135,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">#{materialName},</if>
             <if test="materialType != null">#{materialType},</if>
             <if test="processMethod != null">#{processMethod},</if>
+            <if test="materialModel != null">#{materialModel},</if>
             <if test="brand != null">#{brand},</if>
             <if test="photoUrl != null">#{photoUrl},</if>
             <if test="describe != null">#{describe},</if>
@@ -166,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">material_name = #{materialName},</if>
             <if test="materialType != null">material_type = #{materialType},</if>
             <if test="processMethod != null">processMethod = #{processMethod},</if>
+            <if test="materialModel != null">material_model = #{materialModel},</if>
             <if test="brand != null">brand = #{brand},</if>
             <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
             <if test="describe != null">`describe` = #{describe},</if>

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

@@ -97,8 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">has_complete_num,</if>
             <if test="thisReceivingNum != null">this_receiving_num,</if>
             <if test="hasReceivingNum != null">has_receiving_num,</if>
-            <if test="snCode != null">sn_code,</if>
-            <if test="shippingDeviceId != null">shipping_device_id,</if>
             <if test="sharedStockAllocatedNum != null">shared_stock_allocated_num,</if>
             <if test="fixedStockAllocatedNum != null">fixed_stock_allocated_num,</if>
             <if test="createTime != null">create_time,</if>
@@ -130,8 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">#{hasCompleteNum},</if>
             <if test="thisReceivingNum != null">#{thisReceivingNum},</if>
             <if test="hasReceivingNum != null">#{hasReceivingNum},</if>
-            <if test="snCode != null">#{snCode},</if>
-            <if test="shippingDeviceId != null">#{shippingDeviceId},</if>
             <if test="sharedStockAllocatedNum != null">#{sharedStockAllocatedNum},</if>
             <if test="fixedStockAllocatedNum != null">#{fixedStockAllocatedNum},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -167,8 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">has_complete_num = #{hasCompleteNum},</if>
             <if test="thisReceivingNum != null">this_receiving_num = #{thisReceivingNum},</if>
             <if test="hasReceivingNum != null">has_receiving_num = #{hasReceivingNum},</if>
-            <if test="snCode != null">sn_code = #{snCode},</if>
-            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
             <if test="sharedStockAllocatedNum != null">shared_stock_allocated_num = #{sharedStockAllocatedNum},</if>
             <if test="fixedStockAllocatedNum != null">fixed_stock_allocated_num = #{fixedStockAllocatedNum},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -207,8 +201,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">has_complete_num = #{hasCompleteNum},</if>
             <if test="thisReceivingNum != null">this_receiving_num = #{thisReceivingNum},</if>
             <if test="hasReceivingNum != null">has_receiving_num = #{hasReceivingNum},</if>
-            <if test="snCode != null">sn_code = #{snCode},</if>
-            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
             <if test="sharedStockAllocatedNum != null">shared_stock_allocated_num = #{sharedStockAllocatedNum},</if>
             <if test="fixedStockAllocatedNum != null">fixed_stock_allocated_num = #{fixedStockAllocatedNum},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-admin/src/main/resources/templates/erp/material/select.html

@@ -42,7 +42,7 @@
         var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
-        var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+        var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
         var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
         var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
         var prefix = ctx + "erp/material";

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html

@@ -149,6 +149,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
@@ -286,6 +287,7 @@
                             materialCode: rowData.materialNo,
                             materialName: rowData.materialName,
                             materialType: rowData.materialType,
+                            materialModel: rowData.materialModel,
                             describe: rowData.describe,
                             brand: rowData.brand,
                             unit: rowData.unit,

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html

@@ -191,6 +191,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html

@@ -199,6 +199,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
@@ -271,6 +272,7 @@
                     materialCode: rowData.materialNo,
                     materialName: rowData.materialName,
                     materialType: rowData.materialType,
+                    materialModel: rowData.materialModel,
                     describe: rowData.describe,
                     brand: rowData.brand,
                     unit: rowData.unit,

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html

@@ -234,6 +234,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html

@@ -234,6 +234,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html

@@ -217,6 +217,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
@@ -280,6 +281,7 @@
                     materialCode: rowData.materialNo,
                     materialName: rowData.materialName,
                     materialType: rowData.materialType,
+                    materialModel: rowData.materialModel,
                     describe: rowData.describe,
                     brand: rowData.brand,
                     unit: rowData.unit,

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

@@ -35,16 +35,32 @@
                             <div class="panel panel-default">
                                 <div class="panel-heading">
                                     <h5 class="panel-title">
-                                        <a data-toggle="collapse" data-parent="#version" href="#v111">v1.0.0</a><code class="pull-right">2024.12.10</code>
+                                        <a data-toggle="collapse" data-parent="#version" href="#v222">v2.0.0</a><code class="pull-right">2025.01.03</code>
                                     </h5>
                                 </div>
-                                <div id="v111" class="panel-collapse collapse in">
+                                <div id="v222" class="panel-collapse collapse in">
                                     <div class="panel-body">
                                         <ol>
-                                            <li>第一版上线测试</li>
+                                            <li>第二版上线测试</li>
                                         </ol>
                                     </div>
                                 </div>
+
+
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <h5 class="panel-title">
+                                            <a data-toggle="collapse" data-parent="#version" href="#v111">v1.0.0</a><code class="pull-right">2024.12.10</code>
+                                        </h5>
+                                    </div>
+                                    <div id="v111" class="panel-collapse collapse in">
+                                        <div class="panel-body">
+                                            <ol>
+                                                <li>第一版上线测试</li>
+                                            </ol>
+                                        </div>
+                                    </div>
+
                             </div>
                             <!--测试2-->
 <!--                            <div class="panel panel-default">-->