|
@@ -8,6 +8,7 @@ import com.ruoyi.ams.order.form.CancelOrderForm;
|
|
|
import com.ruoyi.ams.order.form.InvTallyForm;
|
|
|
import com.ruoyi.ams.order.service.IWmsDocOrderDetailsService;
|
|
|
import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
|
|
|
+import com.ruoyi.base.constant.Constant;
|
|
|
import com.ruoyi.base.service.IBaseIdsequenceService;
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
@@ -17,6 +18,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
+import org.apache.commons.compress.utils.Sets;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -153,7 +155,7 @@ public class WmsDocOrderHeaderController extends BaseController {
|
|
|
@PostMapping("/addDocOrderHeader")
|
|
|
public AjaxResult addDocOrderHeader(@RequestBody WmsDocOrderHeader wmsDocOrderHeader) {
|
|
|
LoginUser loginUser = getLoginUser();
|
|
|
- if(StringUtils.equals("DZ", wmsDocOrderHeader.getOrderType())
|
|
|
+ if(Sets.newHashSet(Constant.ASN_TYP.DZ.getValue(), Constant.ASN_TYP.YK.getValue()).add(wmsDocOrderHeader.getOrderType())
|
|
|
&& StringUtils.isBlank(wmsDocOrderHeader.getSoReference3())){
|
|
|
return AjaxResult.error("袋装出库请指定破袋机编号");
|
|
|
}
|