采购辅料

src/main/java/com/steerinfo/dil/controller/TmstruckTotalResultController.java

@@ -38,10 +38,10 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "map", value = "订单Id", required = false, dataType = "Map"),
     })
     @PostMapping("/addTotalResult")
-    public RESTfulResult addTotalResult(@RequestBody(required=false) Map<String, Object> map){
+    public int addTotalResult(@RequestBody(required=false) Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         int i = tmstruckTotalResultService.addTotalResult(orderId);
-        return success(i);
+        return i;
     }
     /**
      * 展示计数实绩列表

src/main/java/com/steerinfo/dil/service/impl/TmstruckTotalResultServiceImpl.java

@@ -30,11 +30,14 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
      */
     public int addTotalResult(BigDecimal orderId){
         TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
-        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectMaxId());
+        BigDecimal maxId = tmstruckTotalResultMapper.selectMaxId();
+        tmstruckTotalResult.setResultTotalId(maxId);
         tmstruckTotalResult.setOrderId(orderId);
         tmstruckTotalResult.setInsertTime(new Date());
         tmstruckTotalResult.setInsertUsername("admin");
-        return tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+        tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+        return maxId.intValue();
+
     }
     /**
      * 展示计数实绩列表

src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -121,8 +121,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
      * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      *{
      *     "orderNumber": "WYSDD2021112800000765",
-     *     "warehouseName": "二棒库",
-     *     "unloadTime":  1638286010000
+     *     "warehouseId": 1
      * }
      * @param map
      * @return
@@ -177,14 +176,12 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     public int updateUnloadResultBy(Map<String, Object> map){
         TmstruckUnloadResult tmstruckUnloadResult = new TmstruckUnloadResult();
         tmstruckUnloadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
-        //通过卸货地点（仓库）查询仓库ID
-        BigDecimal resultUnloadPlaceId = tmstruckUnloadResultMapper.getWarehouseIdByWName((String) map.get("warehouseName"));
         // 修改卸货点
-        if(resultUnloadPlaceId != null){
-            tmstruckUnloadResult.setResultUnloadPlaceId(resultUnloadPlaceId);
+        if(map.get("warehouseId") != null){
+            tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         }
         //获得卸货时间
-        tmstruckUnloadResult.setResultStartTime(new Date((long) map.get("unloadTime")));
+        tmstruckUnloadResult.setResultStartTime(new Date());
         //扫码后确认卸货所以卸货状态码为  1 同意
         tmstruckUnloadResult.setUnloadStatus(new BigDecimal(1));
         tmstruckUnloadResult.setInsertTime(new Date());

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -42,8 +42,7 @@ public class DataChange {
      * @param data
      * @return
      */
-    public static BigDecimal
-    dataToBigDecimal(Object data){
+    public static BigDecimal dataToBigDecimal(Object data){
         if (data != null){
             if(data instanceof String){
                 String data1 = (String) data;