Merge branch 'refs/heads/master' into master_lz

# Conflicts:
#	wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
#	wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java

wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml

@@ -5,10 +5,27 @@
     <select id="selectWorkOrderPage" resultType="top.wms.admin.weighManage.model.resp.WorkOrderResp">
         select
             w.*,
-            m.material_name
+            m.material_name,
+            m.encoding,
+            m.photo_url,
+            m.unit_weight,
+            u.card_no,
+            u.username createUserString,
+            count(*) as totalCount
         from sys_work_order w
-                 left join sys_material_info m on w.material_id = m.id
+            left join sys_material_info m on w.material_id = m.id
+            left join sys_user u on w.create_user = u.id
+            left join sys_work_order_info wi on w.id = wi.work_order_id
         ${ew.customSqlSegment}
     </select>
 
+    <select id="getDetail" resultType="top.wms.admin.weighManage.model.resp.WorkOrderInfoResp">
+        select
+            wi.*,
+            m.material_name
+        from sys_work_order_info wi
+            left join sys_material_info m on wi.material_id = m.id
+        where wi.work_order_id = #{id}
+    </select>
+
 </mapper>