1.博瑞科，库存账明细接口增加生产订单，领料数据

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.xml

@@ -46,9 +46,9 @@
     </select>
     <select id="stockDataDetails" resultType="org.springblade.salesPart.excel.PjShipStockDetails">
         SELECT
-        ps.id as id,
-        ps.storage_id as stockId,
-        ps.call_in_storage_id as callInStorageId,
+        ps.id AS id,
+        ps.storage_id AS stockId,
+        ps.call_in_storage_id AS callInStorageId,
         ps.billno AS billno,
         ps.customer_name AS corpName,
         ps.status_name AS statusName,
@@ -56,7 +56,7 @@
         pgd.brand_item AS brandItem,
         pgd.cname AS goodsName,
         pgd.specification_and_model AS specificationAndModel,
-        psi.inventory as totalNum,
+        psi.inventory AS totalNum,
         CASE
         ps.biz_type_name
         WHEN 'FHGD' THEN
@@ -71,6 +71,10 @@
         '退货入库'
         WHEN 'TKFHGD' THEN
         '退货出库'
+        WHEN 'SCLL' THEN
+        '出库'
+        WHEN 'SCDD' THEN
+        '入库'
         END AS bizTypeName,
         CASE
         ps.biz_type_name
@@ -79,7 +83,10 @@
         ( SUM( psi.send_num ), SUM( psi.send_num ), 0 )
         WHEN 'TKFHGD' THEN
         IF
-        ( SUM( psi.send_num ), SUM( psi.send_num ), 0 ) ELSE 0
+        ( SUM( psi.send_num ), SUM( psi.send_num ), 0 )
+        WHEN 'SCLL' THEN
+        IF
+        ( SUM( psi.send_num ), SUM( psi.send_num ), 0 )  ELSE 0
         END AS SubSendTotalNum,
         CASE
         ps.biz_type_name
@@ -98,7 +105,9 @@
         WHEN 'THSHGD' THEN
         IF
         ( SUM( psi.send_num ), SUM( psi.send_num ), 0 )
-        ELSE 0
+        WHEN 'SCDD' THEN
+        IF
+        ( SUM( psi.send_num ), SUM( psi.send_num ), 0 ) ELSE 0
         END AS addSendTotalNum
         FROM
         pjpf_ship_items psi
@@ -107,9 +116,9 @@
         WHERE
         ps.is_deleted = '0'
         and psi.is_deleted = '0'
-        AND FIND_IN_SET( ps.biz_type_name, 'FHGD,SHGD,TKSHGD,DBGD,THSHGD,TKFHGD' )
+        AND FIND_IN_SET( ps.biz_type_name, 'FHGD,SHGD,TKSHGD,DBGD,THSHGD,TKFHGD,SCDD,SCLL' )
         AND ps.tenant_id = #{order.tenantId}
-        AND FIND_IN_SET( ps.status_name, '已入库,已出库,确认调拨' )
+        AND FIND_IN_SET( ps.status_name, '已入库,已出库,确认调拨,已确认' )
         <if test="order.dot!=null and order.dot!=''">
             and psi.dot = #{order.dot}
         </if>