Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

昨天 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java

@@ -72,8 +72,7 @@
            }
            PurchaseTemplate template = list.stream().findFirst().get();
            Purchase purchase = new Purchase();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
            Date date = dateFormat.parse(template.getArrTime());
            Date date = template.getArrTime();
            BeanUtils.copyProperties(template, purchase);
            purchase.setCode(template.getPoCode());
            if (StringUtils.isBlank(template.getPoCode())) {