txf 3 år sedan
förälder
incheckning
d4e2eeb4f1

+ 2 - 0
src/main/java/com/steerinfo/dil/controller/AmstruckRailDayplanController.java

@@ -52,6 +52,8 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
         return success(arriveName);
     }
 
+
+
     /**
      *新增日计划
      */

+ 0 - 1
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -33,7 +33,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     //通过销售订单号查询销售订单的修改日志
     List<Map<String, Object>> getSaleOrderUpdateLog(Map<String,Object> map);
 
-
     List<Map<String,Object>> getSaleOrderList(Map<String,Object> mapValue);
 
     List<Integer>  getCarrier(Integer param);

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/AmstruckRailDayplanMapper.java

@@ -33,4 +33,6 @@ public interface AmstruckRailDayplanMapper extends IBaseMapper<AmstruckRailDaypl
 
     //查询所有到站信息
     List<Map<String, Object>> getArriveName();
+
+
 }

+ 4 - 4
src/main/java/com/steerinfo/dil/model/AmstruckRailDayplan.java

@@ -43,7 +43,7 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
      * 收货单位(DAYPLAN_RECEIVE_UNIT,VARCHAR,20)
      */
     @ApiModelProperty(value="收货单位",required=false)
-    private String dayplanReceiveUnit;
+    private BigDecimal dayplanReceiveUnit;
 
     /**
      * 发货日期(DAYPLAN_DELIVERY_DATE,TIMESTAMP,7)
@@ -164,12 +164,12 @@ public class AmstruckRailDayplan implements IBasePO<BigDecimal> {
         this.dayplanDeliveryPlace = dayplanDeliveryPlace == null ? null : dayplanDeliveryPlace.trim();
     }
 
-    public String getDayplanReceiveUnit() {
+    public BigDecimal getDayplanReceiveUnit() {
         return dayplanReceiveUnit;
     }
 
-    public void setDayplanReceiveUnit(String dayplanReceiveUnit) {
-        this.dayplanReceiveUnit = dayplanReceiveUnit == null ? null : dayplanReceiveUnit.trim();
+    public void setDayplanReceiveUnit(BigDecimal dayplanReceiveUnit) {
+        this.dayplanReceiveUnit = dayplanReceiveUnit;
     }
 
     public Date getDayplanDeliveryDate() {

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/AmstruckRailDayplanMapper.xml

@@ -488,7 +488,7 @@
        t.dayplan_material_weight as "dayplanMaterialWeight"
 from amstruck_rail_dayplan t
 left join rms_material rm on t.material_id=rm.material_id
-where t.dayplan_receive_status=0 and  t.material_id=495
+where t.dayplan_receive_status = 0 and  t.material_id = 495
     </select>
   <!-- 展示汽车发运焦炭/水渣日计划 -->
   <select id="getSzTruckRailDayPlan" parameterType="java.util.Map" resultType="java.util.Map">