问题修改

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizTruckMapper.java

@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface BizTruckMapper extends BaseMapper<BizTruckEntity> {
 
-    @Select("SELECT id,uscc FROM biz_company WHERE user_id = #{userId}")
+    @Select("SELECT company_id id FROM biz_driver WHERE user_id = #{userId}")
     SearchCompanyResult selectCompanyByUserId(@Param("userId") Long userId);
 
     IPage<SearchTruckResult> paging(Page<Object> page, @Param("ew") QueryWrapper<SearchTruckResult> ew);

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizProjectEntity.java

@@ -106,7 +106,15 @@ public class BizProjectEntity {
      * 项目所在地纬度
      */
     private Double lat;
+    /**
+     * 审核状态; 字典代码：audit_status
+     */
+    private String auditStatus;
 
+    /**
+     * 审核备注
+     */
+    private String auditMemo;
     /**
      * 创建人 Id; sys_user.id
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java

@@ -97,6 +97,7 @@ public class BizTruckService extends ServiceImpl<BizTruckMapper, BizTruckEntity>
     public PageResult<BizTruckEntity> dispensabilityList(PageParam pageParam, String keywords) {
         UserDetail userDetail = SecurityUtil.loginUser();
         SearchCompanyResult searchCompanyResult = baseMapper.selectCompanyByUserId(userDetail.getUserId());
+        Assert.notNull(searchCompanyResult, () -> Exceptions.exception("未查询到公司信息"));
         return PageResult.of(this.page(pageParam.toPage(), Wrappers.<BizTruckEntity>lambdaQuery()
                 // .eq(BizTruckEntity::getBusy, false)
                 .eq(BizTruckEntity::getAuditStatus, AuditStatus.TongGuo)

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/OrderInfoController.java

@@ -125,8 +125,8 @@ public class OrderInfoController {
     /**
      * 看料
      */
-    @GetMapping("/check")
+    @PostMapping("/check")
-    public R<?> check(CheckGoodsParam checkGoodsParam) {
+    public R<?> check(@RequestBody CheckGoodsParam checkGoodsParam) {
         orderInfoService.check(checkGoodsParam);
         return R.success();
     }
@@ -155,8 +155,8 @@ public class OrderInfoController {
     /**
      * 开始清运
      */
-    @GetMapping("/start_trans")
+    @PostMapping("/start_trans")
-    public R<?> startTrans(StartTransportOrderParam startTransportOrderParam) {
+    public R<?> startTrans(@RequestBody StartTransportOrderParam startTransportOrderParam) {
         orderInfoService.startTrans(startTransportOrderParam);
         return R.success();
     }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java

@@ -56,7 +56,7 @@ public class OrderInfoEntity {
     /**
      * 车道
      */
-    private String laneId;
+    private String lane;
 
     /**
      * 下单人 Id; sys_user.id

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java

@@ -48,7 +48,7 @@ public class OrderPagingResult {
     /**
      * 车道
      */
-    private String laneId;
+    private String lane;
 
     /**
      * 项目 Id
@@ -163,12 +163,12 @@ public class OrderPagingResult {
     /**
      * 装车照片
      */
-    private String cargoPhoto;
+    private List<String> cargoPhoto;
 
     /**
      * 看料照片
      */
-    private String checkPhoto;
+    private List<String> checkPhoto;
     /**
      * 现场照片
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderCarInOutService.java

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
+import com.njzscloud.supervisory.biz.service.BizTruckService;
 import com.njzscloud.supervisory.order.contant.OrderCategory;
 import com.njzscloud.supervisory.order.mapper.OrderCarInOutMapper;
 import com.njzscloud.supervisory.order.pojo.entity.OrderCarInOutEntity;
 import com.njzscloud.supervisory.order.pojo.param.TruckComingOrderParam;
 import com.njzscloud.supervisory.order.pojo.param.TruckLeavingOrderParam;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +25,9 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class OrderCarInOutService extends ServiceImpl<OrderCarInOutMapper, OrderCarInOutEntity> implements IService<OrderCarInOutEntity> {
+    private final BizTruckService bizTruckService;
 
     /**
      * 新增
@@ -86,7 +91,7 @@ public class OrderCarInOutService extends ServiceImpl<OrderCarInOutMapper, Order
      * 车辆出场
      */
     @Transactional(rollbackFor = Exception.class)
-    public void truckOut(Long carInOutId, TruckLeavingOrderParam truckLeavingOrderParam, OrderCategory orderCategory) {
+    public Integer truckOut(Long carInOutId, TruckLeavingOrderParam truckLeavingOrderParam, OrderCategory orderCategory, Long truckId) {
         OrderCarInOutEntity orderCarInOutEntity = this.getById(carInOutId);
         Integer roughWeight = null;
         Integer tareWeight = null;
@@ -99,6 +104,9 @@ public class OrderCarInOutService extends ServiceImpl<OrderCarInOutMapper, Order
             settleWeight = orderCarInOutEntity.getRoughWeight() - tareWeight;
         }
 
+        bizTruckService.updateById(new BizTruckEntity()
+                .setId(truckId)
+                .setTareWeight(settleWeight));
         this.updateById(new OrderCarInOutEntity()
                 .setId(carInOutId)
                 .setRoughWeight(roughWeight)
@@ -108,5 +116,6 @@ public class OrderCarInOutService extends ServiceImpl<OrderCarInOutMapper, Order
                 .setSettleWeight(settleWeight)
                 .setOutTime(LocalDateTime.now())
         );
+        return settleWeight;
     }
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderGoodsService.java

@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.goods.pojo.entity.GoodsCategoryEntity;
 import com.njzscloud.supervisory.goods.pojo.entity.GoodsInfoEntity;
+import com.njzscloud.supervisory.goods.service.GoodsCategoryService;
 import com.njzscloud.supervisory.goods.service.GoodsInfoService;
 import com.njzscloud.supervisory.order.mapper.OrderGoodsMapper;
 import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
@@ -28,13 +30,14 @@ import java.util.List;
 public class OrderGoodsService extends ServiceImpl<OrderGoodsMapper, OrderGoodsEntity> implements IService<OrderGoodsEntity> {
 
     private final GoodsInfoService goodsInfoService;
+    private final GoodsCategoryService goodsCategoryService;
     /**
      * 新增
      */
     @Transactional(rollbackFor = Exception.class)
     public long add(Long goodsId) {
         GoodsInfoEntity goodsInfoEntity = goodsInfoService.getById(goodsId);
-        Assert.notNull(goodsInfoEntity, () -> Exceptions.clierr("商品不存在"));
+        Assert.notNull(goodsInfoEntity, () -> Exceptions.clierr("产品不存在"));
         goodsInfoEntity.setId(null);
         OrderGoodsEntity orderGoodsEntity = BeanUtil.copyProperties(goodsInfoEntity, OrderGoodsEntity.class)
                 .setOriginGoodsId(goodsId);
@@ -46,7 +49,20 @@ public class OrderGoodsService extends ServiceImpl<OrderGoodsMapper, OrderGoodsE
      * 修改
      */
     public void modify(OrderGoodsEntity orderGoodsEntity) {
-        this.updateById(orderGoodsEntity);
+        Long originGoodsId = orderGoodsEntity.getOriginGoodsId();
+        GoodsInfoEntity goodsInfoEntity = goodsInfoService.getById(originGoodsId);
+        Assert.notNull(goodsInfoEntity, () -> Exceptions.clierr("产品不存在"));
+        GoodsCategoryEntity goodsCategoryEntity = goodsCategoryService.getById(goodsInfoEntity.getGoodsCategoryId());
+        Assert.notNull(goodsCategoryEntity, () -> Exceptions.clierr("产品分类不存在"));
+        this.updateById(orderGoodsEntity
+                .setGoodsName(goodsInfoEntity.getGoodsName())
+                .setUnitPrice(goodsInfoEntity.getUnitPrice())
+                .setUnit(goodsInfoEntity.getUnit())
+                .setMoneyStrategy(goodsInfoEntity.getMoneyStrategy())
+                .setMoneyConfigId(goodsInfoEntity.getMoneyConfigId())
+                .setPicture(goodsInfoEntity.getPicture())
+                .setTaxRate(goodsInfoEntity.getTaxRate())
+        );
     }
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -180,21 +180,20 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         if (CollUtil.isEmpty(areas)) {
             return PageResult.of(pageParam.toPage());
         }
+        QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
+                .in("b.area", areas);
         AuditStatus auditStatus = orderPagingSearchParam.getAuditStatus();
 
-        List<String> orderStatusList = null;
         if (auditStatus != null) {
             if (auditStatus == AuditStatus.DaiShenHe) {
-                orderStatusList = Arrays.asList(AuditStatus.QuDaiShenHe.getVal(), AuditStatus.ShiDaiShenHe.getVal());
+                ew.eq("a.order_status", OrderStatus.YiJieDan)
+                        .in("a.audit_status", Arrays.asList(AuditStatus.QuDaiShenHe.getVal(), AuditStatus.ShiDaiShenHe.getVal()));
             } else {
-                orderStatusList = Collections.singletonList(auditStatus.getVal());
+                ew.in("a.audit_status", Collections.singletonList(auditStatus.getVal()));
             }
         }
 
-        return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<OrderPagingResult>query()
+        return PageResult.of(baseMapper.paging(pageParam.toPage(), ew));
-                .in("b.area", areas)
-                .eq("a.order_status", OrderStatus.YiJieDan)
-                .in(CollUtil.isNotEmpty(orderStatusList), "a.audit_status", orderStatusList)));
     }
 
     public void audit(AuditOrderParam auditOrderParam) {
@@ -243,13 +242,15 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
     @Transactional(rollbackFor = Exception.class)
     public void check(CheckGoodsParam checkGoodsParam) {
-        OrderInfoEntity oldOrder = this.getById(checkGoodsParam.getOrderId());
+        Long orderId = checkGoodsParam.getOrderId();
+        OrderInfoEntity oldOrder = this.getById(orderId);
         Assert.notNull(oldOrder, () -> Exceptions.clierr("订单不存在"));
         CheckStatus checkStatus = oldOrder.getCheckStatus();
         Assert.isFalse(checkStatus == null, () -> Exceptions.clierr("当前订单无需看料"));
         Assert.isFalse(CheckStatus.YiKanLiao == checkStatus, () -> Exceptions.clierr("当前订单已看料"));
 
         this.updateById(new OrderInfoEntity()
+                .setId(orderId)
                 .setCheckPhoto(checkGoodsParam.getCheckPhoto())
                 .setCheckStatus(CheckStatus.YiKanLiao)
                 .setCheckerId(SecurityUtil.currentUserId())
@@ -304,6 +305,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         );
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void startTrans(StartTransportOrderParam startTransportOrderParam) {
         OrderInfoEntity orderInfo = this.getById(startTransportOrderParam.getOrderId());
         Assert.notNull(orderInfo, () -> Exceptions.clierr("订单不存在"));
@@ -379,11 +381,14 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Assert.isTrue(orderStatus == OrderStatus.YiJinChang, () -> Exceptions.clierr("当前订单状态，无法出场"));
         this.updateById(new OrderInfoEntity()
                 .setId(orderInfoEntity.getId())
-                .setOrderStatus(OrderStatus.YiChuChang)
+                .setOrderStatus(OrderStatus.YiWanCheng)
         );
         OrderCategory orderCategory = orderInfoEntity.getOrderCategory();
-        orderCarInOutService.truckOut(orderInfoEntity.getCarInOutId(), truckLeavingOrderParam, orderCategory);
+        Long truckId = orderInfoEntity.getTruckId();
-
+        Integer settleWeight = orderCarInOutService.truckOut(orderInfoEntity.getCarInOutId(), truckLeavingOrderParam, orderCategory, truckId);
+        orderGoodsService.updateById(new OrderGoodsEntity()
+                .setId(orderInfoEntity.getGoodsId())
+                .setQuantity(settleWeight));
         // TODO 关闭 GPS
 
     }
@@ -398,11 +403,11 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
     public PageResult<OrderPagingResult> dispatchPaging(PageParam pageParam, OrderPagingSearchParam orderPagingSearchParam) {
         AuditStatus auditStatus = orderPagingSearchParam.getAuditStatus();
-        String orderStatus = orderPagingSearchParam.getOrderStatus();
+/*         String orderStatus = orderPagingSearchParam.getOrderStatus();
         List<String> orderStatusList = null;
         if (StrUtil.isNotBlank(orderStatus)) {
             orderStatusList = Arrays.stream(orderStatus.split(",")).collect(Collectors.toList());
-        }
+        } */
         CheckStatus checkStatus = orderPagingSearchParam.getCheckStatus();
         String sn = orderPagingSearchParam.getSn();
         String licensePlate = orderPagingSearchParam.getLicensePlate();
@@ -421,7 +426,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .like(StrUtil.isNotBlank(nickname), "h.nickname", nickname)
                 .like(StrUtil.isNotBlank(phone), "h.phone", phone)
                 .eq(auditStatus != null, "a.audit_status", auditStatus)
-                .in(CollUtil.isNotEmpty(orderStatusList), "a.order_status", orderStatusList)
+                // .in(CollUtil.isNotEmpty(orderStatusList), "a.order_status", orderStatusList)
                 .eq(checkStatus != null, "a.check_status", checkStatus)
                 .ge(startTime != null, "a.create_time", startTime)
                 .le(endTime != null, "a.create_time", endTime);

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -113,19 +113,33 @@
                  LEFT JOIN sys_user h ON h.id = a.user_id
                  LEFT JOIN goods_category i ON i.id = c.goods_category_id
     </sql>
-    <select id="paging" resultType="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
+
+    <resultMap id="OrderPagingResultMap" autoMapping="true" type="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
+        <result property="cargoPhoto" column="cargo_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="checkPhoto" column="check_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="sitePhotos" column="site_photos" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
+        <result property="auditStatus" column="audit_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="orderCategory" column="order_category" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="orderStatus" column="order_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="checkStatus" column="check_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="payerCategory" column="payer_category" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="paymentStatus" column="payment_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="moneyStrategy" column="money_strategy" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+
+    </resultMap>
+    <select id="paging" resultMap="OrderPagingResultMap">
         <include refid="base_select"/>
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
     </select>
-    <select id="detail" resultType="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
+    <select id="detail" resultMap="OrderPagingResultMap">
         <include refid="base_select"/>
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
     </select>
-    <select id="pendingOrder" resultType="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
+    <select id="pendingOrder" resultMap="OrderPagingResultMap">
         <include refid="base_select"/>
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}

z-doc/db-model/njzscloud.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "data:image/png;base64,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",
   "version": "4.9.4",
   "createdTime": "2023-4-13 11:53:52",
-  "updatedTime": "2025-9-15 16:35:54",
+  "updatedTime": "2025-9-16 15:32:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -14685,6 +14685,60 @@
           "extProps": {},
           "id": "4FDE45FD-8E4C-4FCD-9933-41A9B0F5FFEE"
         },
+        {
+          "defKey": "audit_status",
+          "defName": "审核状态",
+          "comment": "字典代码：audit_status",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "F88D246F-A17A-4711-A6AB-500EF85E91E1",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "4FF47DE6-BDA2-4EBC-9927-C934F8387715",
+          "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231"
+        },
+        {
+          "defKey": "audit_memo",
+          "defName": "审核备注",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 512,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "''",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "BFB16E0F-0D7D-4F45-9919-774AA438CA4E",
+          "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231"
+        },
         {
           "defKey": "creator_id",
           "defName": "创建人 Id",
@@ -15821,6 +15875,60 @@
           "id": "C4E28793-9263-4D81-9C28-C3E2FB8723C5",
           "baseType": "D57B7F8D-4728-43D3-9F21-A1953D885CFB"
         },
+        {
+          "defKey": "audit_status",
+          "defName": "审核状态",
+          "comment": "字典代码：audit_status",
+          "type": "VARCHAR",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "F88D246F-A17A-4711-A6AB-500EF85E91E1",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "C864C2F7-CDC2-45D5-947C-120D1001B3D7",
+          "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231"
+        },
+        {
+          "defKey": "audit_memo",
+          "defName": "审核备注",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 512,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "''",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "87DCC0D3-41CC-4331-9839-10799C282A9D",
+          "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231"
+        },
         {
           "defKey": "creator_id",
           "defName": "创建人 Id",