1.调整库存养护记录和详情查询

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java

@@ -45,7 +45,7 @@ public class InvMAOrderDetailController {
         PageSimpleResponse<InvMAOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(pageInfo.getList());
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     /**
@@ -55,7 +55,7 @@ public class InvMAOrderDetailController {
      * @param bindingResult
      * @return
      */
-    @PostMapping("/inv/MA/order/detail/addOrderDetail")
+    @PostMapping(" /inv/MA/order/detail/addOrderDetail")
     public BaseResponse addOrderDetail(@RequestBody InvMaintenanceOrderDetailEntity invMaintenanceOrderDetailEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java

@@ -14,4 +14,19 @@ public class InvMAOrderDetailResponse extends InvMaintenanceOrderDetailEntity {
      */
     private String productName;
 
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 注册/备案凭证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产厂家
+     */
+    private String ylqxzcrbarmc;
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java

@@ -44,7 +44,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
         if (null == filterInvMAOrderDetailRequest) {
             return Collections.emptyList();
         }
-        if (null == filterInvMAOrderDetailRequest.getPage() && null == filterInvMAOrderDetailRequest.getLimit()) {
+        if (null != filterInvMAOrderDetailRequest.getPage() && null != filterInvMAOrderDetailRequest.getLimit()) {
             PageHelper.offsetPage((filterInvMAOrderDetailRequest.getPage() - 1) * filterInvMAOrderDetailRequest.getLimit(), filterInvMAOrderDetailRequest.getLimit());
         }
         return invMAOrderDetailDao.filterList(filterInvMAOrderDetailRequest);

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java

@@ -68,7 +68,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
         //设置状态为草稿
         invMaintenanceOrder.setStatus(0);
         invMAOrderDao.insert(invMaintenanceOrder);
-        return ResultVOUtils.success(invMaintenanceOrder.getOrderId());
+        return ResultVOUtils.success(invMaintenanceOrder);
     }
 
     @Override

api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml

@@ -195,22 +195,22 @@
                  left join inv_space on ma.invSpaceCode = inv_space.code
         <where>
             <if test="id != null">
-                AND id = #{id}
+                AND ma.id = #{id}
             </if>
             <if test="orderId != null and orderId != ''">
-                AND orderId = #{orderId}
+                AND ma.orderId = #{orderId}
             </if>
             <if test="invWarehouseCode != null and invWarehouseCode != ''">
-                AND invWarehouseCode = #{invWarehouseCode}
+                AND ma.invWarehouseCode = #{invWarehouseCode}
             </if>
             <if test="invSpaceCode != null and invSpaceCode != ''">
-                AND invSpaceCode = #{invSpaceCode}
+                AND ma.invSpaceCode = #{invSpaceCode}
             </if>
             <if test="status != null">
-                AND status = #{status}
+                AND ma.status = #{status}
             </if>
         </where>
-        order by updateTime desc
+        order by ma.updateTime desc
     </select>
 
     <select id="selectByOrderId" resultMap="BaseResultMap">

api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml

@@ -201,27 +201,35 @@
     </select>
 
     <select id="filterList" resultType="com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse">
-        select mad.id,
+        SELECT mad.id,
-               orderIdFk,
+               mad.orderIdFk,
-               code,
+               mad.CODE,
-               productId,
+               mad.productId,
-               nameCode,
+               mad.nameCode,
-               batchNo,
+               mad.batchNo,
-               produceDate,
+               mad.produceDate,
-               expireDate,
+               mad.expireDate,
-               count,
+               mad.count,
-               maintenanceStatus,
+               mad.maintenanceStatus,
-               deviceStatus,
+               mad.deviceStatus,
-               remark,
+               mad.remark,
-               basic_products.cpmctymc productName
+               basic_products.cpmctymc productName,
-        from inv_maintenance_order_detail mad
+               ip.ggxh,
-                 left join basic_udirel on mad.productId = basic_udirel.id
+               basic_products.zczbhhzbapzbh,
-                 left join basic_products on basic_products.uuid = basic_udirel.uuid
+               basic_products.ylqxzcrbarmc
+        FROM inv_maintenance_order_detail mad
+                 left join inv_maintenance_order ma on mad.orderIdFk = ma.orderId
+                 LEFT JOIN basic_udirel ON mad.productId = basic_udirel.id
+                 LEFT JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
+                 left join inv_product_detail ipd on ipd.productIdFk = mad.productId
+            and ipd.invWarehouseCode = ma.invWarehouseCode and ipd.invSpaceCode = ma.invSpaceCode
+                 left join inv_product ip on ipd.productIdFk = ip.relIdFk and ip.batchNo = ipd.batchNo
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
-                AND orderIdFk = #{orderIdFk}
+                AND mad.orderIdFk = #{orderIdFk}
             </if>
         </where>
+        group by mad.code
     </select>
 
     <select id="selectByOrderIdAndCode" resultMap="BaseResultMap">