|
|
@@ -202,9 +202,10 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
|
|
|
@Override
|
|
|
public void send(Long noticeId, SaleSend send) {
|
|
|
PurchaseNotice notice = purchaseNoticeDao.findOne(noticeId);
|
|
|
- List<SaleSend> saleSend = saleSendDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), send.getCode());
|
|
|
- if (saleSend.size() > 0)
|
|
|
- throw new IllegalOperatorException("发货单号重复,无法发货!提示:多个物料一起发货请选择批量发货。");
|
|
|
+// //限制同一个供应商发货单号不可以重复,(限制被去掉 -- 2015年6月5日15:23:52)
|
|
|
+// List<SaleSend> saleSend = saleSendDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), send.getCode());
|
|
|
+// if (saleSend.size() > 0)
|
|
|
+// throw new IllegalOperatorException("发货单号重复,无法发货!提示:多个物料一起发货请选择批量发货。");
|
|
|
if (notice != null) {
|
|
|
double thisQty = 0;
|
|
|
for (SaleSendItem item : send.getSendItems())
|
|
|
@@ -257,9 +258,10 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
|
|
|
@Override
|
|
|
public SaleSend send(SaleSend saleSend) {
|
|
|
if (saleSend != null) {
|
|
|
- List<SaleSend> saleSends = saleSendDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), saleSend.getCode());
|
|
|
- if (saleSends.size() > 0)
|
|
|
- throw new IllegalOperatorException("发货单号重复,无法发货!提示:多个物料一起发货请选择批量发货。");
|
|
|
+// //限制同一个供应商发货单号不可以重复,(限制被去掉 -- 2015年6月5日15:23:52)
|
|
|
+// List<SaleSend> saleSends = saleSendDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), saleSend.getCode());
|
|
|
+// if (saleSends.size() > 0)
|
|
|
+// throw new IllegalOperatorException("发货单号重复,无法发货!提示:多个物料一起发货请选择批量发货。");
|
|
|
saleSend.setBackStatus((short) Status.NOT_UPLOAD.value());
|
|
|
saleSend.setSendStatus((short) Status.NOT_UPLOAD.value());
|
|
|
saleSend.setEnUU(SystemSession.getUser().getEnterprise().getUu());
|