出库

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

@@ -272,19 +272,19 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
     @ApiOperation(value = "创建倒垛单",notes = "管理员创建一个垛位倒另一个垛位的倒垛单，其中包括原来朵唯信息和物质类型")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "keeperId" ,dataType = "BigDecimal",value = "库管员ID"),
-            @ApiImplicitParam(name = "resultStackNumber" ,dataType = "String ",value = "倒垛单编号"),
+            @ApiImplicitParam(name = "beforeLevel" ,dataType = "String ",value = "倒垛层"),
             @ApiImplicitParam(name = "afterStackingId" ,dataType = "BigDecimal",value = "倒垛后垛位id"),
             @ApiImplicitParam(name = "afterWarehouseId" ,dataType = "BigDecimal",value = "倒垛后仓库id"),
             @ApiImplicitParam(name = "afterBeforeStackingId" ,dataType = "BigDecimal",value = "倒垛前的垛位"),
             @ApiImplicitParam(name = "resultRemark" ,dataType = "BigDecimal",value = "倒垛单备注"),
             @ApiImplicitParam(name = "maps" ,dataType = "List<Map<String,Object>>",value = "物质类型集合")
     })
-    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,@RequestParam("resultStackNumber")String  resultStackNumber,
+    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,@RequestParam("resultStackNumber")String  beforeLevel,
              @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,@RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
              @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,@RequestParam("resultRemark")String resultRemark,
              @RequestBody(required = false) List<Map<String,Object>> mps){
         //创建倒垛单和倒垛单类型
-        WmspRestackMakeResult wmspRestackMakeResult= wmspRestackMakeResultService.createRestackMakeResult(keeperId,resultStackNumber,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+        WmspRestackMakeResult wmspRestackMakeResult= wmspRestackMakeResultService.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
         return success();
     }
 

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

@@ -10,7 +10,7 @@ import java.util.Date;
 public class IDUtils {
     public static BigDecimal createIDYMDHMS(BigDecimal count){
         //获得yyyyMMddHHmmss格式日期
-        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyyMMddHHmmss");
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyMMddHHmm");
         String date = simpleDateFormat.format(new Date());
         //获得计数器数量、保证了唯一性
         return new BigDecimal(date+count);