更新仓内抓拍2

jiazx0107@163.com

2023-11-06 69cd9f59a0fabf12f8c9147fcba7f69817a870b3

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java

@@ -3,7 +3,9 @@
import java.util.ArrayList;
import java.util.List;

import com.bstek.bdf2.core.business.IUser;
import com.ld.igds.constant.Constant;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.manager.InoutReportManager;
@@ -11,6 +13,7 @@
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutRecord;

import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -19,9 +22,10 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.service.HInoutSettleService;
import com.ld.igds.models.InoutSettle;

import javax.annotation.Resource;

/**
 * 结算管理
@@ -31,13 +35,13 @@
@Component
public class InoutSettlePR {

   @Autowired
   @Resource
   private HInoutSettleService hSettleService;

   @Autowired
   @Resource
   private InoutReportManager inoutReportManager;

   @Autowired
   @Resource
   private InoutSettleServiceMapper inoutSettleServiceMapper;

   /**
@@ -53,6 +57,100 @@
      list.add(new DicTrigger(Constant.YN_Y, "已结算"));
      return list;
   }
	
   /**
    * 结算方式 0：现金，1：转账
    * ${dorado.getDataProvider("inoutSettlePR#triggerPayType").getResult()}
    *
    * @return
    */
   @DataProvider
   public List<DicTrigger> triggerPayType() {
      List<DicTrigger> list = new ArrayList<DicTrigger>();
      list.add(new DicTrigger("0", "现金"));
      list.add(new DicTrigger("1", "转账"));
      return list;
   }
	
	
	
   /**
    * 入库结算-合同结算
    * inoutSettlePR#pageSettleIn1
    *
    * @param param
    * @return
    * @throws Exception
    */
   @DataProvider
   public void pageSettleIn1(Page<InoutSettle> page, InoutParam param)throws Exception {
		
      if(null == param)param = new InoutParam();

      IUser u = ContextUtil.getLoginUser();

      param.setCompanyId(u.getCompanyId());


      if(null == param.getDeptId()){
         param.setDeptId(ContextUtil.subDeptId(u));
      }

      param.setSettleBizType("1");
      param.setType(InoutConstant.TYPE_IN);
		
      hSettleService.pageSettle(page, param);
   }
	
   /**
    * 入库结算-单车结算
    * inoutSettlePR#pageSettleIn0
    *
    * @param param
    * @return
    * @throws Exception
    */
   @DataProvider
   public void pageSettleIn0(Page<InoutSettle> page, InoutParam param)throws Exception {
      if(null == param)param = new InoutParam();
      IUser u = ContextUtil.getLoginUser();

      param.setCompanyId(u.getCompanyId());


      if(null == param.getDeptId()){
         param.setDeptId(ContextUtil.subDeptId(u));
      }

      param.setSettleBizType("0");
      param.setType(InoutConstant.TYPE_IN);
      hSettleService.pageSettle(page, param);
   }
	
   /**
    * 出库结算-合同结算
    * inoutSettlePR#pageSettleOut1
    *
    * @param param
    * @return
    * @throws Exception
    */
   @DataProvider
   public void pageSettleOut1(Page<InoutSettle> page, InoutParam param)throws Exception {
      IUser u = ContextUtil.getLoginUser();

      param.setCompanyId(u.getCompanyId());


      if(null == param.getDeptId()){
         param.setDeptId(ContextUtil.subDeptId(u));
      }

      param.setSettleBizType("1");
      param.setType(InoutConstant.TYPE_OUT);
      hSettleService.pageSettle(page, param);
   }
	

   /**
    * inoutSettlePR#pageInoutRecord
@@ -64,7 +162,6 @@
   @DataProvider
   public void pageInoutRecord(Page<InoutRecord> page, InoutParam param)
         throws Exception {
      param.setSettleTag(Constant.YN_N);
      hSettleService.pageIoutRecord(page, param);
   }

@@ -137,22 +234,22 @@
   private InoutSettle getNewSettle(InoutData data) {
      InoutSettle inoutSettle = new InoutSettle();
      inoutSettle.setId(data.getId());
      inoutSettle.setType(data.getType());
      inoutSettle.setCustomerId(data.getCustomerId());
      inoutSettle.setCustomerName(data.getCustomerName());
      inoutSettle.setFullWeight(data.getFullWeight());
      inoutSettle.setEmptyWeight(data.getEmptyWeight());
      inoutSettle.setNetWeight(data.getNetWeight());
   //   inoutSettle.setType(data.getType());
   //   inoutSettle.setCustomerId(data.getCustomerId());
   //   inoutSettle.setCustomerName(data.getCustomerName());
   //   inoutSettle.setFullWeight(data.getFullWeight());
   //   inoutSettle.setEmptyWeight(data.getEmptyWeight());
   //   inoutSettle.setNetWeight(data.getNetWeight());
      inoutSettle.setSettleWeight(data.getSettleWeight());
      inoutSettle.setDeSum(data.getDeSum());
   //   inoutSettle.setDeSum(data.getDeSum());

      inoutSettle.setCompleteTime(data.getCompleteTime());
   //   inoutSettle.setCompleteTime(data.getCompleteTime());
      inoutSettle.setDepotId(data.getDepotId());
      inoutSettle.setDeptId(data.getDeptId());
      inoutSettle.setUserName(data.getUserName());
      inoutSettle.setPlateNum(data.getPlateNum());
      inoutSettle.setFoodLevel(data.getFoodLevel());
      inoutSettle.setFoodVariety(data.getFoodVariety());
   //   inoutSettle.setUserName(data.getUserName());
   //   inoutSettle.setPlateNum(data.getPlateNum());
   //   inoutSettle.setFoodLevel(data.getFoodLevel());
   //   inoutSettle.setFoodVariety(data.getFoodVariety());

      if (data.getPrice() != null) {
         inoutSettle.setPayPrice(data.getPrice());
@@ -167,9 +264,9 @@
   @Expose
   @Transactional
   public String saveData(InoutSettle data) {
      if (null == data.getType()) {
         data.setType(InoutConstant.TYPE_IN);
      }
//      if (null == data.getType()) {
//         data.setType(InoutConstant.TYPE_IN);
//      }

      hSettleService.saveOrUpdateData(data);