1

src/main/java/com/chinaitop/depot/device/model/StorageJsglKhxx.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.device.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class StorageJsglKhxx {
     private String id;
 
@@ -32,6 +34,7 @@ public class StorageJsglKhxx {
 
     private BigDecimal crksl;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date crkrq;
 
     /**

src/main/java/com/chinaitop/depot/device/service/impl/StorageJsglServiceImpl.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.device.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import javax.annotation.Resource;
 
@@ -64,9 +65,7 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 	@Override
 	public void addStorageJsgl(StorageJsgl storageJsgl) throws Exception {
 
-		String id = ParameterUtil.getUuid();
 		Date date = new Date();
-		storageJsgl.setId(id);
 		storageJsgl.setCreateTime(date);
 		storageJsgl.setUpdateTime(date);
 
@@ -93,9 +92,14 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 		storageJsgl.setFpText(fpText);
 
 		if (StringUtils.isBlank(storageJsgl.getId())) {
+			String id = ParameterUtil.getUuid();
+			storageJsgl.setId(id);
 			addStorageJsgl(storageJsgl);
 			if (storageJsgl.getKhxxlist().size() > 0) {
 				for (int i = 0; i < storageJsgl.getKhxxlist().size(); i++) {
+					storageJsgl.getKhxxlist().get(i).setId(UUID.randomUUID().toString().replace("-", ""));
+					storageJsgl.getKhxxlist().get(i).setOrgId(storageJsgl.getOrgId());
+					storageJsgl.getKhxxlist().get(i).setZid(id);
 					storageJsglKhxxMapper.insert(storageJsgl.getKhxxlist().get(i));
 				}
 			}