提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/mapper/OrderDeliveryVoMapper.java

@@ -4,6 +4,7 @@ import com.xingxi.business.Order.domain.OrderDelivery;
 import com.xingxi.web.controller.business.order.domain.OrderDeliveryVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,4 +30,12 @@ public interface OrderDeliveryVoMapper {
      * @return 发货单明细Vo集合
      */
     List<OrderDeliveryVo> selectOrderDeliveryVoList(OrderDeliveryVo orderDeliveryVo);
+
+    /**
+     * 更新发货单明细的打印次数
+     *
+     * @param orderDeliveryIds 发货单明细VoID列表
+     * @return 影响行数
+     */
+    int updateOrderDeliveryList(@Param("orderDeliveryIds") Long[] orderDeliveryIds, @Param("updateUser") String updateUser, @Param("updateTime") Date updateTime);
 }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/service/impl/OrderDetailVoServiceImpl.java

@@ -15,6 +15,7 @@ import com.xingxi.web.controller.business.order.domain.OrderDetailVo;
 import com.xingxi.web.controller.business.order.domain.OrderVo;
 import com.xingxi.web.controller.business.order.domain.VendorOrderDetailVo;
 import com.xingxi.web.controller.business.order.mapper.OrderDeliveryExprVoMapper;
+import com.xingxi.web.controller.business.order.mapper.OrderDeliveryVoMapper;
 import com.xingxi.web.controller.business.order.mapper.OrderDetailVoMapper;
 import com.xingxi.web.controller.business.order.service.IOrderDetailVoService;
 import org.springframework.stereotype.Service;
@@ -37,6 +38,8 @@ public class OrderDetailVoServiceImpl implements IOrderDetailVoService {
     @Resource
     private OrderDeliveryMapper orderDeliveryMapper;
     @Resource
+    private OrderDeliveryVoMapper orderDeliveryVoMapper;
+    @Resource
     private OrderDeliveryExprMapper orderDeliveryExprMapper;
     @Resource
     private OrderDeliveryExprVoMapper orderDeliveryExprVoMapper;
@@ -81,9 +84,19 @@ public class OrderDetailVoServiceImpl implements IOrderDetailVoService {
      * @return 发货单Vo 集合
      */
     @Override
+    @Transactional
     public List<VendorOrderDetailVo> exportVendorOrderVoList(OrderVo orderVo) {
         orderVo.setOrderDetailIds(Convert.toStrArray(orderVo.getSelectedOrderDetailIds()));
-        return orderDetailVoMapper.exportVendorOrderVoList(orderVo);
+        List<VendorOrderDetailVo> exportList = orderDetailVoMapper.exportVendorOrderVoList(orderVo);
+        // 更新打印次数
+        if (exportList.size() > 0) {
+            Long[] orderDeliveryIds = new Long[exportList.size()];
+            for (int i = 0; i < exportList.size(); i++) {
+                orderDeliveryIds[i] = exportList.get(i).getOrderDeliveryId();
+            }
+            orderDeliveryVoMapper.updateOrderDeliveryList(orderDeliveryIds, ShiroUtils.getLoginName(), DateUtils.getNowDate());
+        }
+        return exportList;
     }
 
     /**
@@ -110,7 +123,7 @@ public class OrderDetailVoServiceImpl implements IOrderDetailVoService {
                 if (checkObject != null) {
                     if (EOrderDeliveryStatus.RECEIVED.getVal().equals(checkObject.getOrderDeliveryStatus())) {
                         failureNum++;
-                        failureMsg.append("<br/>" + failureNum + "、发货单编号 " + vendorOrderDetailVo.getOrderDeliveryId() + " 已发货，不能导入。");
+                        failureMsg.append("<br/>" + failureNum + "、发货单编号 " + vendorOrderDetailVo.getOrderDeliveryId() + " 已收货，不能导入。");
                     } else {
                         orderDeliveryExprVoMapper.deleteOrderDeliveryExprByOrderDeliveryId(vendorOrderDetailVo.getOrderDeliveryId());
                         String[] expressNos = Convert.toStrArray(vendorOrderDetailVo.getExpressNo());

08.src/Xingxi/xingxi-admin/src/main/resources/mapper/OrderDeliveryVoMapper.xml

@@ -93,4 +93,15 @@
         and t_order_delivery_expr.orderDeliveryId = t_order_delivery.orderDeliveryId
         where t_order_delivery.orderDetailId = #{orderDetailId}
     </select>
+
+    <update id="updateOrderDeliveryList" parameterType="Prod">
+        update t_order_delivery set
+            printTimes = printTimes + 1,
+            updateUser = #{updateUser},
+            updateTime = #{updateTime}
+        where orderDeliveryId in
+        <foreach item="orderDeliveryId" collection="orderDeliveryIds" open="(" separator="," close=")">
+            #{orderDeliveryId}
+        </foreach>
+    </update>
 </mapper>