master
parent
3e0641b89e
commit
6347094e13
61
pom.xml
61
pom.xml
|
@ -432,16 +432,16 @@
|
|||
|
||||
<!-- 工具包 -->
|
||||
<!-- JSON begin -->
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.codehaus.jackson</groupId>-->
|
||||
<!--<artifactId>jackson-mapper-asl</artifactId>-->
|
||||
<!--<version>${jackson.version}</version>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.codehaus.jackson</groupId>-->
|
||||
<!--<artifactId>jackson-core-asl</artifactId>-->
|
||||
<!--<version>${jackson.version}</version>-->
|
||||
<!--</dependency>-->
|
||||
<dependency>
|
||||
<groupId>net.sf.json-lib</groupId>
|
||||
<artifactId>json-lib</artifactId>
|
||||
|
@ -947,27 +947,38 @@
|
|||
<artifactId>springfox-swagger2</artifactId>
|
||||
<version>2.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
<version>2.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>2.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>2.5.1</version>
|
||||
</dependency>
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>com.fasterxml.jackson.core</groupId>-->
|
||||
<!--<artifactId>jackson-core</artifactId>-->
|
||||
<!--<version>2.5.1</version>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>com.fasterxml.jackson.core</groupId>-->
|
||||
<!--<artifactId>jackson-databind</artifactId>-->
|
||||
<!--<version>2.5.1</version>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>com.fasterxml.jackson.core</groupId>-->
|
||||
<!--<artifactId>jackson-annotations</artifactId>-->
|
||||
<!--<version>2.5.1</version>-->
|
||||
<!--</dependency>-->
|
||||
<!-- swagger end -->
|
||||
<dependency>
|
||||
<groupId>org.jdom</groupId>
|
||||
<artifactId>jdom2</artifactId>
|
||||
<version>2.0.4</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>2.8.8.1</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<organization>
|
||||
|
|
|
@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import javax.validation.ConstraintViolation;
|
||||
import javax.validation.Validator;
|
||||
|
||||
import com.zzjee.wm.entity.*;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
|
||||
import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
|
||||
|
@ -81,11 +82,6 @@ import com.zzjee.md.entity.MdCusEntity;
|
|||
import com.zzjee.md.entity.MdGoodsEntity;
|
||||
import com.zzjee.md.entity.MdSupEntity;
|
||||
import com.zzjee.md.entity.MvGoodsEntity;
|
||||
import com.zzjee.wm.entity.WmImNoticeHEntity;
|
||||
import com.zzjee.wm.entity.WmImNoticeIEntity;
|
||||
import com.zzjee.wm.entity.WmInQmIEntity;
|
||||
import com.zzjee.wm.entity.WmPlatIoEntity;
|
||||
import com.zzjee.wm.entity.WmToUpGoodsEntity;
|
||||
import com.zzjee.wm.page.WmImNoticeHPage;
|
||||
import com.zzjee.wm.page.WmNoticeImpPage;
|
||||
import com.zzjee.wm.service.WmImNoticeHServiceI;
|
||||
|
@ -2304,7 +2300,7 @@ public class WmImNoticeHController extends BaseController {
|
|||
return listWmImNoticeHs;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
|
||||
@RequestMapping(value = "/{id}", method = RequestMethod.GET )
|
||||
@ResponseBody
|
||||
public ResponseEntity<?> get(@PathVariable("id") String id) {
|
||||
WmImNoticeHEntity task = wmImNoticeHService.get(
|
||||
|
@ -2315,21 +2311,13 @@ public class WmImNoticeHController extends BaseController {
|
|||
return new ResponseEntity(task, HttpStatus.OK);
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
|
||||
@RequestMapping(value = "/apicreate")
|
||||
@ResponseBody
|
||||
public ResponseEntity<?> create(
|
||||
@RequestBody WmImNoticeHPage wmImNoticeHPage,
|
||||
UriComponentsBuilder uriBuilder) {
|
||||
@RequestBody WmImNoticeHPage wmImNoticeHPage) {
|
||||
// 调用JSR303 Bean Validator进行校验,如果出错返回含400错误码及json格式的错误信息.
|
||||
ResultDO D0 = new ResultDO();
|
||||
|
||||
Set<ConstraintViolation<WmImNoticeHPage>> failures = validator
|
||||
.validate(wmImNoticeHPage);
|
||||
if (!failures.isEmpty()) {
|
||||
return new ResponseEntity(
|
||||
BeanValidators.extractPropertyAndMessage(failures),
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
|
||||
// 保存
|
||||
List<WmImNoticeIEntity> wmImNoticeIList = wmImNoticeHPage
|
||||
|
@ -2337,11 +2325,25 @@ public class WmImNoticeHController extends BaseController {
|
|||
|
||||
WmImNoticeHEntity wmImNoticeH = new WmImNoticeHEntity();
|
||||
try {
|
||||
MyBeanUtils.copyBeanNotNull2Bean(wmImNoticeH, wmImNoticeHPage);
|
||||
String noticeid = wmUtil.getNextNoticeid(wmImNoticeH.getOrderTypeCode()) ;
|
||||
wmImNoticeHPage.setNoticeId(noticeid);
|
||||
MyBeanUtils.copyBeanNotNull2Bean(wmImNoticeHPage,wmImNoticeH);
|
||||
} catch (Exception e) {
|
||||
logger.info(e.getMessage());
|
||||
}
|
||||
wmImNoticeHService.addMain(wmImNoticeH, wmImNoticeIList);
|
||||
|
||||
List<WmImNoticeIEntity> wmOmNoticeIListnew = new ArrayList<>();
|
||||
for(WmImNoticeIEntity t: wmImNoticeIList){
|
||||
try{
|
||||
MdGoodsEntity md =systemService.findUniqueByProperty(MdGoodsEntity.class,"shpBianMa",t.getGoodsCode());
|
||||
wmImNoticeH.setCusCode(md.getSuoShuKeHu());
|
||||
}catch ( Exception e){
|
||||
|
||||
}
|
||||
|
||||
wmOmNoticeIListnew.add(t);
|
||||
}
|
||||
wmImNoticeHService.addMain(wmImNoticeH, wmOmNoticeIListnew);
|
||||
D0.setOK(true);
|
||||
return new ResponseEntity(D0, HttpStatus.OK);
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import javax.validation.ConstraintViolation;
|
||||
import javax.validation.Validator;
|
||||
|
||||
import com.zzjee.md.entity.MdGoodsEntity;
|
||||
import com.zzjee.tms.entity.TmsYwDingdanEntity;
|
||||
import com.zzjee.wm.page.*;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
|
@ -2404,25 +2405,33 @@ public class WmOmNoticeHController extends BaseController {
|
|||
return new ResponseEntity(task, HttpStatus.OK);
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
|
||||
public ResponseEntity<?> create(@RequestBody WmOmNoticeHPage wmOmNoticeHPage, UriComponentsBuilder uriBuilder) {
|
||||
@RequestMapping(value = "/apicreate")
|
||||
@ResponseBody
|
||||
public ResponseEntity<?> create(@RequestBody WmOmNoticeHPage wmOmNoticeHPage ) {
|
||||
//调用JSR303 Bean Validator进行校验,如果出错返回含400错误码及json格式的错误信息.
|
||||
ResultDO D0 = new ResultDO();
|
||||
Set<ConstraintViolation<WmOmNoticeHPage>> failures = validator.validate(wmOmNoticeHPage);
|
||||
if (!failures.isEmpty()) {
|
||||
return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
|
||||
//保存
|
||||
List<WmOmNoticeIEntity> wmOmNoticeIList = wmOmNoticeHPage.getWmOmNoticeIList();
|
||||
|
||||
String noticeid = wmUtil.getNextomNoticeId(wmOmNoticeHPage.getOrderTypeCode());
|
||||
wmOmNoticeHPage.setOmNoticeId(noticeid);
|
||||
WmOmNoticeHEntity wmOmNoticeH = new WmOmNoticeHEntity();
|
||||
try{
|
||||
MyBeanUtils.copyBeanNotNull2Bean(wmOmNoticeH,wmOmNoticeHPage);
|
||||
MyBeanUtils.copyBeanNotNull2Bean(wmOmNoticeHPage,wmOmNoticeH);
|
||||
}catch(Exception e){
|
||||
logger.info(e.getMessage());
|
||||
}
|
||||
wmOmNoticeHService.addMain(wmOmNoticeH, wmOmNoticeIList);
|
||||
List<WmOmNoticeIEntity> wmOmNoticeIListnew = new ArrayList<>();
|
||||
for(WmOmNoticeIEntity t: wmOmNoticeIList){
|
||||
try{
|
||||
MdGoodsEntity md =systemService.findUniqueByProperty(MdGoodsEntity.class,"shpBianMa",t.getGoodsId());
|
||||
t.setCusCode(md.getSuoShuKeHu());
|
||||
}catch ( Exception e){
|
||||
|
||||
}
|
||||
|
||||
wmOmNoticeIListnew.add(t);
|
||||
}
|
||||
wmOmNoticeHService.addMain(wmOmNoticeH, wmOmNoticeIListnew);
|
||||
D0.setOK(true);
|
||||
//按照Restful风格约定,创建指向新任务的url, 也可以直接返回id或对象.
|
||||
return new ResponseEntity(D0, HttpStatus.OK);
|
||||
|
|
|
@ -27,7 +27,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
|
|||
* @version V1.0
|
||||
*
|
||||
*/
|
||||
public class WmImNoticeHPage implements java.io.Serializable {
|
||||
public class WmImNoticeHPage {
|
||||
/**主键*/
|
||||
private java.lang.String id;
|
||||
/**创建人名称*/
|
||||
|
@ -59,37 +59,27 @@ public class WmImNoticeHPage implements java.io.Serializable {
|
|||
|
||||
private java.lang.String sysCompanyCode;
|
||||
/**客户编码*/
|
||||
@Excel(name="客户编码")
|
||||
private java.lang.String cusCode;
|
||||
/**预计到货时间*/
|
||||
@Excel(name="预计到货时间",format = "yyyy-MM-dd")
|
||||
private java.util.Date imData;
|
||||
/**客户订单号*/
|
||||
@Excel(name="客户订单号")
|
||||
private java.lang.String imCusCode;
|
||||
/**司机*/
|
||||
@Excel(name="司机")
|
||||
private java.lang.String imCarDri;
|
||||
/**司机电话*/
|
||||
@Excel(name="司机电话")
|
||||
private java.lang.String imCarMobile;
|
||||
/**车号*/
|
||||
@Excel(name="车号")
|
||||
private java.lang.String imCarNo;
|
||||
/**订单类型*/
|
||||
|
||||
private java.lang.String orderTypeCode;
|
||||
/**月台*/
|
||||
@Excel(name="月台")
|
||||
private java.lang.String platformCode;
|
||||
/**备注*/
|
||||
@Excel(name="备注")
|
||||
private java.lang.String imBeizhu;
|
||||
/**单据状态*/
|
||||
@Excel(name="单据状态")
|
||||
private java.lang.String imSta;
|
||||
/**进货通知单号*/
|
||||
@Excel(name="进货通知单号")
|
||||
private java.lang.String noticeId;
|
||||
/**附件*/
|
||||
|
||||
|
@ -468,8 +458,7 @@ public class WmImNoticeHPage implements java.io.Serializable {
|
|||
this.piMaster = piMaster;
|
||||
}
|
||||
|
||||
/**保存-预约通知项目*/
|
||||
@ExcelCollection(name="预约通知项目")
|
||||
|
||||
private List<WmImNoticeIEntity> wmImNoticeIList = new ArrayList<WmImNoticeIEntity>();
|
||||
public List<WmImNoticeIEntity> getWmImNoticeIList() {
|
||||
return wmImNoticeIList;
|
||||
|
|
|
@ -59,51 +59,36 @@ public class WmOmNoticeHPage implements java.io.Serializable {
|
|||
|
||||
private java.lang.String sysCompanyCode;
|
||||
/**客户*/
|
||||
@Excel(name="客户")
|
||||
private java.lang.String cusCode;
|
||||
/**要求交货时间*/
|
||||
@Excel(name="要求交货时间",format = "yyyy-MM-dd")
|
||||
private java.util.Date delvData;
|
||||
/**收货人*/
|
||||
@Excel(name="收货人")
|
||||
private java.lang.String delvMember;
|
||||
/**收货人电话*/
|
||||
@Excel(name="收货人电话")
|
||||
private java.lang.String delvMobile;
|
||||
/**收货人地址*/
|
||||
@Excel(name="收货人地址")
|
||||
private java.lang.String delvAddr;
|
||||
/**承运人*/
|
||||
@Excel(name="承运人")
|
||||
private java.lang.String reMember;
|
||||
/**承运人电话*/
|
||||
@Excel(name="承运人电话")
|
||||
private java.lang.String reMobile;
|
||||
/**承运人车号*/
|
||||
@Excel(name="承运人车号")
|
||||
private java.lang.String reCarno;
|
||||
/**发货月台*/
|
||||
@Excel(name="发货月台")
|
||||
private java.lang.String omPlatNo;
|
||||
/**备注*/
|
||||
@Excel(name="备注")
|
||||
private java.lang.String omBeizhu;
|
||||
/**状态*/
|
||||
@Excel(name="状态")
|
||||
private java.lang.String omSta;
|
||||
/**出货单号*/
|
||||
@Excel(name="出货单号")
|
||||
private java.lang.String omNoticeId;
|
||||
/**附件*/
|
||||
|
||||
private java.lang.String fuJian;
|
||||
@Excel(name="三方客户编号")
|
||||
|
||||
private java.lang.String ocusCode;
|
||||
@Excel(name="三方客户名称")
|
||||
|
||||
private java.lang.String ocusName;
|
||||
@Excel(name="客户订单号")
|
||||
private java.lang.String imCusCode;
|
||||
private java.lang.String printStatus;
|
||||
private java.lang.String piClass;
|
||||
|
@ -515,7 +500,6 @@ public class WmOmNoticeHPage implements java.io.Serializable {
|
|||
}
|
||||
|
||||
/**保存-出货通知项目*/
|
||||
@ExcelCollection(name="出货通知项目")
|
||||
private List<WmOmNoticeIEntity> wmOmNoticeIList = new ArrayList<WmOmNoticeIEntity>();
|
||||
public List<WmOmNoticeIEntity> getWmOmNoticeIList() {
|
||||
return wmOmNoticeIList;
|
||||
|
@ -524,16 +508,15 @@ public class WmOmNoticeHPage implements java.io.Serializable {
|
|||
this.wmOmNoticeIList = wmOmNoticeIList;
|
||||
}
|
||||
|
||||
/**保存-出货通知项目*/
|
||||
@ExcelCollection(name="运输项目")
|
||||
private List<TmsYwDingdanEntity> wmOmtmsIList = new ArrayList<TmsYwDingdanEntity>();
|
||||
|
||||
|
||||
public List<TmsYwDingdanEntity> getWmOmtmsIList() {
|
||||
return wmOmtmsIList;
|
||||
}
|
||||
|
||||
public void setWmOmtmsIList(List<TmsYwDingdanEntity> wmOmtmsIList) {
|
||||
this.wmOmtmsIList = wmOmtmsIList;
|
||||
}
|
||||
// /**保存-出货通知项目*/
|
||||
// private List<TmsYwDingdanEntity> wmOmtmsIList = new ArrayList<TmsYwDingdanEntity>();
|
||||
//
|
||||
//
|
||||
// public List<TmsYwDingdanEntity> getWmOmtmsIList() {
|
||||
// return wmOmtmsIList;
|
||||
// }
|
||||
//
|
||||
// public void setWmOmtmsIList(List<TmsYwDingdanEntity> wmOmtmsIList) {
|
||||
// this.wmOmtmsIList = wmOmtmsIList;
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -27,6 +27,17 @@
|
|||
<property name="supportedMediaTypes">
|
||||
<list>
|
||||
<value>text/html;charset=UTF-8</value>
|
||||
<value>text/json;charset=UTF-8</value>
|
||||
<value>application/json;charset=UTF-8</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
<!-- ResponseBody返回字符串带双引号解决 -->
|
||||
<bean id="stringHttpMessageConverter" class="org.springframework.http.converter.StringHttpMessageConverter">
|
||||
<constructor-arg value="UTF-8" index="0"/>
|
||||
<property name="supportedMediaTypes">
|
||||
<list>
|
||||
<value>text/plain;charset=UTF-8</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
|
Loading…
Reference in New Issue