Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

2 天以前 84edd2b6308fa018eab932a2db528b7e6e1e6d13

 src/main/java/com/zy/asrs/service/BasArmRulesService.java

@@ -12,4 +12,6 @@

    boolean updateStatus(Double materialLength,Double materialWidth,Double materialHeight,Double materialWeight,Double materialNumber,int status);
    boolean updateStatus(ArmPrecomputeParam.CombMat combMat);

    Integer getNumber(Double weight,Double volume,Double length,Double width,Double height);
}