Subversion Repositories SmartDukaan

Rev

Rev 36015 | Rev 37823 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36015 Rev 37770
Line 20... Line 20...
20 
import com.spice.profitmandi.dao.repository.transaction.SellerRepository;
 20 
import com.spice.profitmandi.dao.repository.transaction.SellerRepository;
21 
import com.spice.profitmandi.dao.repository.transaction.SellerWarehouseRepository;
 21 
import com.spice.profitmandi.dao.repository.transaction.SellerWarehouseRepository;
22 
import com.spice.profitmandi.dao.repository.transaction.WarehouseAddressMappingRepository;
 22 
import com.spice.profitmandi.dao.repository.transaction.WarehouseAddressMappingRepository;
23 
import com.spice.profitmandi.dao.repository.transaction.WarehouseAddressMasterRepository;
 23 
import com.spice.profitmandi.dao.repository.transaction.WarehouseAddressMasterRepository;
24 
import com.spice.profitmandi.dao.repository.warehouse.SupplierRepository;
 24 
import com.spice.profitmandi.dao.repository.warehouse.SupplierRepository;
- 
 
 25 
import com.spice.profitmandi.service.warehouse.SupplierStateResolver;
25 
import com.spice.profitmandi.service.warehouse.WarehouseService;
 26 
import com.spice.profitmandi.service.warehouse.WarehouseService;
26 
import com.spice.profitmandi.web.util.MVCResponseSender;
 27 
import com.spice.profitmandi.web.util.MVCResponseSender;
27 
import org.apache.logging.log4j.LogManager;
 28 
import org.apache.logging.log4j.LogManager;
28 
import org.apache.logging.log4j.Logger;
 29 
import org.apache.logging.log4j.Logger;
29 
import org.springframework.beans.factory.annotation.Autowired;
 30 
import org.springframework.beans.factory.annotation.Autowired;
Line 44... Line 45...
44 
 
 45 
 
45 
    @Autowired
 46 
    @Autowired
46 
    private SupplierRepository supplierRepository;
 47 
    private SupplierRepository supplierRepository;
47 
 
 48 
 
48 
    @Autowired
 49 
    @Autowired
- 
 
 50 
    private SupplierStateResolver supplierStateResolver;
- 
 
 51 
 
- 
 
 52 
    @Autowired
49 
    private MVCResponseSender mvcResponseSender;
 53 
    private MVCResponseSender mvcResponseSender;
50 
 
 54 
 
51 
 
 55 
 
52 
    @Autowired
 56 
    @Autowired
53 
    private SellerRepository sellerRepository;
 57 
    private SellerRepository sellerRepository;
Line 197... Line 201...
197 
        supplier.setContactEmail(createNewSupplier.getContactEmail());
 201 
        supplier.setContactEmail(createNewSupplier.getContactEmail());
198 
        supplier.setContactFax(createNewSupplier.getContactFax());
 202 
        supplier.setContactFax(createNewSupplier.getContactFax());
199 
        supplier.setContactName(createNewSupplier.getContactPerson());
 203 
        supplier.setContactName(createNewSupplier.getContactPerson());
200 
 
 204 
 
201 
        supplier.setContactPhone(createNewSupplier.getContactPhone());
 205 
        supplier.setContactPhone(createNewSupplier.getContactPhone());
202 
        supplier.setGstin(createNewSupplier.getGst());
 - 
 
203 
        supplier.setHeadDesignation(createNewSupplier.getHeadDesign());
 206 
        supplier.setHeadDesignation(createNewSupplier.getHeadDesign());
204 
        supplier.setHeadEmail(createNewSupplier.getHeadEmail());
 207 
        supplier.setHeadEmail(createNewSupplier.getHeadEmail());
205 
        supplier.setHeadName(createNewSupplier.getHeadName());
 208 
        supplier.setHeadName(createNewSupplier.getHeadName());
206 
        supplier.setPan(createNewSupplier.getPan());
 209 
        supplier.setPan(createNewSupplier.getPan());
207 
        supplier.setPhone(createNewSupplier.getPhone());
 210 
        supplier.setPhone(createNewSupplier.getPhone());
208 
        supplier.setPoValidityLimit(createNewSupplier.getpOValidityLimit());
 211 
        supplier.setPoValidityLimit(createNewSupplier.getpOValidityLimit());
209 
        supplier.setRegisteredAddress(createNewSupplier.getRegisteredAddress());
 212 
        supplier.setRegisteredAddress(createNewSupplier.getRegisteredAddress());
210 
        supplier.setStateId(createNewSupplier.getState());
 213 
        supplierStateResolver.applyGstinAndState(supplier, createNewSupplier.getGst(), createNewSupplier.getState());
211 
        supplier.setInternalWarehouseId(createNewSupplier.getInternalWarehouseId());
 214 
        supplier.setInternalWarehouseId(createNewSupplier.getInternalWarehouseId());
212 
        supplierRepository.persist(supplier);
 215 
        supplierRepository.persist(supplier);
213 
 
 216 
 
214 
        Vendor vendor = new Vendor();
 217 
        Vendor vendor = new Vendor();
215 
        vendor.setName(supplier.getName());
 218 
        vendor.setName(supplier.getName());
Line 285... Line 288...
285 
                                 Model model) throws Exception {
 288 
                                 Model model) throws Exception {
286 
        LOGGER.info("supplierFormDataaaa - " + supplierFormData);
 289 
        LOGGER.info("supplierFormDataaaa - " + supplierFormData);
287 
 
 290 
 
288 
        Supplier supplier = supplierRepository.selectById(supplierId);
 291 
        Supplier supplier = supplierRepository.selectById(supplierId);
289 
        supplier.setContactPhone(supplierFormData.getInputPhone());
 292 
        supplier.setContactPhone(supplierFormData.getInputPhone());
290 
        supplier.setGstin(supplierFormData.getInputGst());
 - 
 
291 
        supplier.setPan(supplierFormData.getInputPan());
 293 
        supplier.setPan(supplierFormData.getInputPan());
292 
        supplier.setFax(supplierFormData.getInputFax());
 294 
        supplier.setFax(supplierFormData.getInputFax());
293 
        supplier.setHeadName(supplierFormData.getInputHeadName());
 295 
        supplier.setHeadName(supplierFormData.getInputHeadName());
294 
        supplier.setHeadDesignation(supplierFormData.getInputHeadDesign());
 296 
        supplier.setHeadDesignation(supplierFormData.getInputHeadDesign());
295 
        supplier.setHeadEmail(supplierFormData.getInputHeadEmail());
 297 
        supplier.setHeadEmail(supplierFormData.getInputHeadEmail());
Line 305... Line 307...
305 
            supplier.setInternal(true);
 307 
            supplier.setInternal(true);
306 
        } else {
 308 
        } else {
307 
            supplier.setInternal(false);
 309 
            supplier.setInternal(false);
308 
            supplier.setInternalWarehouseId(null);
 310 
            supplier.setInternalWarehouseId(null);
309 
        }
 311 
        }
310 
        supplier.setStateId(supplierFormData.getStateId());
 312 
        supplierStateResolver.applyGstinAndState(supplier, supplierFormData.getInputGst(), supplierFormData.getStateId());
311 
        supplier.setPoValidityLimit(supplierFormData.getInputPOValidityLimit());
 313 
        supplier.setPoValidityLimit(supplierFormData.getInputPOValidityLimit());
312 
 
 314 
 
313 
        List<Integer> newWarehouseIds = supplierFormData.getInputWarehouseLocation();
 315 
        List<Integer> newWarehouseIds = supplierFormData.getInputWarehouseLocation();
314 
 
 316 
 
315 
        // Only run the warehouse update logic if new warehouse IDs are provided
 317 
        // Only run the warehouse update logic if new warehouse IDs are provided