个人面料概况

hx-service/storage/src/main/java/com/fjhx/material/mapper/MaterialReceivingMapper.xml

@@ -29,7 +29,7 @@
                mr.submit_user_account  submitUserAccount,
                mr.receive_user_account receiveUserAccount
         from material_receiving mr
-                 inner join material_receiving_details mrd on mrd.status = 2 and mr.id = mrd.material_receiving_id
+                 inner join material_receiving_details mrd on mr.id = mrd.material_receiving_id
                  inner join stock_tag st on mrd.rfid = st.RfidCode
                  inner join material m on st.MaterialCode = m.Code
         where mr.receive_user_account = #{receiveUserAccount}
@@ -71,7 +71,7 @@
                mr.receive_user_account receiveUserAccount,
                mrd.status              status
         from material_receiving mr
-                 inner join material_receiving_details mrd on mrd.status = 2 and mr.id = mrd.material_receiving_id
+                 inner join material_receiving_details mrd on mr.id = mrd.material_receiving_id
                  inner join stock_tag st on mrd.rfid = st.RfidCode
                  inner join material m on st.MaterialCode = m.Code
         where mr.submit_user_account = #{submitUserAccount}

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -313,12 +313,17 @@
         select m.Code       materialCode,
                m.Name       materialName,
                m.Width      width,
-               std.quantity changeNum
+               std.quantity changeNum,
+               uu.RealName  receiveUser,
+               uu2.RealName submitUser
         from stock_transfer st
                  left join stock_transfer_details std on st.id = std.stock_transfer_id
                  left join material m on st.material_id = m.id
                  left join u_user uu on uu.ID = st.receive_user
                  left join acc_account aa on uu.ID = aa.ID
+
+                 left join acc_account aa2 on aa2.AccountNo = st.submit_user
+                 left join u_user uu2 on uu2.ID = aa2.ID
             ${ew.customSqlSegment}
     </select>
 
@@ -326,10 +331,19 @@
         select m.Code       materialCode,
                m.Name       materialName,
                m.Width      width,
-               std.quantity changeNum
+               std.quantity changeNum,
+
+               uu.RealName  receiveUser,
+               uu2.RealName submitUser
         from stock_transfer st
                  left join stock_transfer_details std on st.id = std.stock_transfer_id
                  left join material m on st.material_id = m.id
+
+                 left join u_user uu on uu.ID = st.receive_user
+                 left join acc_account aa on uu.ID = aa.ID
+
+                 left join acc_account aa2 on aa2.AccountNo = st.submit_user
+                 left join u_user uu2 on uu2.ID = aa2.ID
             ${ew.customSqlSegment}
     </select>
 

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -604,6 +604,9 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
                     Object changeNum = item.get("changeNum");
 
                     JSONObject map = new JSONObject();
+                    map.put("receiveUser", item.get("receiveUser"));
+                    map.put("submitUser", item.get("submitUser"));
+
                     map.put("materialCode", item.get("materialCode"));
                     map.put("materialName", item.get("materialName"));
                     map.put("count", 1);