Commit 20bbfaf0 by zhanglt

盘盈入库相关接口,物资领用出库、盘亏出库、直接出库、更新二维码状态

parent 0e5f32d5
...@@ -16,6 +16,7 @@ import com.jeeplus.modules.warehouse.goods.entity.GoodsInfo; ...@@ -16,6 +16,7 @@ import com.jeeplus.modules.warehouse.goods.entity.GoodsInfo;
import com.jeeplus.modules.warehouse.profitwarehousing.entity.ProfitWarehousingInfo; import com.jeeplus.modules.warehouse.profitwarehousing.entity.ProfitWarehousingInfo;
import com.jeeplus.modules.warehouse.profitwarehousing.mapper.ProfitWarehousingInfoMapper; import com.jeeplus.modules.warehouse.profitwarehousing.mapper.ProfitWarehousingInfoMapper;
import com.jeeplus.modules.warehouse.qrcode.entity.QrCode; import com.jeeplus.modules.warehouse.qrcode.entity.QrCode;
import com.jeeplus.modules.warehouse.qrcode.service.QrCodeService;
import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -54,6 +55,9 @@ public class ProfitWarehousingController extends BaseController { ...@@ -54,6 +55,9 @@ public class ProfitWarehousingController extends BaseController {
private ProfitWarehousingService profitWarehousingService; private ProfitWarehousingService profitWarehousingService;
@Autowired @Autowired
private ProfitWarehousingInfoMapper profitWarehousingInfoMapper; private ProfitWarehousingInfoMapper profitWarehousingInfoMapper;
@Autowired
private QrCodeService qrCodeService;
@ModelAttribute @ModelAttribute
public ProfitWarehousing get(@RequestParam(required=false) String id) { public ProfitWarehousing get(@RequestParam(required=false) String id) {
...@@ -288,11 +292,12 @@ public class ProfitWarehousingController extends BaseController { ...@@ -288,11 +292,12 @@ public class ProfitWarehousingController extends BaseController {
j.setMsg("请先生成二维码"); j.setMsg("请先生成二维码");
} }
if(profitWarehousingInfo.getQrCode() != null){ if(profitWarehousingInfo.getQrCode() != null){
QrCode qrCode = profitWarehousingInfo.getQrCode(); QrCode qrCode = qrCodeService.get(profitWarehousingInfo.getQrCode().getId());
//刚生成未入库
if(Objects.equals(qrCode.getState(), "0")){
profitWarehousingService.inLedgerInfo(profitWarehousingInfo);//保存
}
} }
//新增或编辑表单保存
profitWarehousingService.inLedgerInfo(profitWarehousingInfo);//保存
j.setSuccess(true); j.setSuccess(true);
j.setMsg("物资入帐成功"); j.setMsg("物资入帐成功");
return j; return j;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment